Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
---
libavcodec/mpegvideo.c | 30 ++++++++++++------------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 3daccb816f..dd50c03306 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -455,6 +455,15 @@ static void free_duplicate_context(MpegEncContext *s)
s->block = NULL;
}
+static void free_duplicate_contexts(MpegEncContext *s)
+{
+ for (int i = 1; i < s->slice_context_count; i++) {
+ free_duplicate_context(s->thread_context[i]);
+ av_freep(&s->thread_context[i]);
+ }
+ free_duplicate_context(s);
+}
+
static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src)
{
#define COPY(a) bak->a = src->a
@@ -1049,16 +1058,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
if (!s->context_initialized)
return AVERROR(EINVAL);
- if (s->slice_context_count > 1) {
- for (i = 0; i < s->slice_context_count; i++) {
- free_duplicate_context(s->thread_context[i]);
- }
- for (i = 1; i < s->slice_context_count; i++) {
- av_freep(&s->thread_context[i]);
- }
- } else
- free_duplicate_context(s);
-
+ free_duplicate_contexts(s);
free_context_frame(s);
if (s->picture)
@@ -1106,15 +1106,9 @@ void ff_mpv_common_end(MpegEncContext *s)
if (!s)
return;
- if (s->slice_context_count > 1) {
- for (i = 0; i < s->slice_context_count; i++) {
- free_duplicate_context(s->thread_context[i]);
- }
- for (i = 1; i < s->slice_context_count; i++) {
- av_freep(&s->thread_context[i]);
- }
+ free_duplicate_contexts(s);
+ if (s->slice_context_count > 1)
s->slice_context_count = 1;
- } else free_duplicate_context(s);
av_freep(&s->parse_context.buffer);
s->parse_context.buffer_size = 0;
--
2.25.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
