Ticket #7251: ffmpeg-issue-7251.patch

libavcodec/mpeg12enc.c

@@ -1161 +1161 @@
     .pix_fmts             = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
                                                            AV_PIX_FMT_NONE },
     .capabilities         = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
+    .caps_internal        = FF_CODEC_CAP_INIT_CLEANUP,
     .priv_class           = &mpeg1_class,
 };
 
@@ -1178 +1179 @@
                                                            AV_PIX_FMT_YUV422P,
                                                            AV_PIX_FMT_NONE },
     .capabilities         = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
+    .caps_internal        = FF_CODEC_CAP_INIT_CLEANUP,
     .priv_class           = &mpeg2_class,
 };

libavcodec/utils.c

@@ -540 +540 @@
     int ret = 0;
     AVDictionary *tmp = NULL;
     const AVPixFmtDescriptor *pixdesc;
+    int needFrameThreadEncoderFreeOnError = 0;
+    int needThreadFreeOnError = 0;
 
     if (avcodec_is_open(avctx))
         return 0;
@@ -724 +726 @@
         ff_lock_avcodec(avctx, codec);
         if (ret < 0)
             goto free_and_end;
+        needFrameThreadEncoderFreeOnError = 1;
     }
 
     if (HAVE_THREADS
@@ -732 +735 @@
         if (ret < 0) {
             goto free_and_end;
         }
+        needThreadFreeOnError = 1;
     }
     if (!HAVE_THREADS && !(codec->capabilities & AV_CODEC_CAP_AUTO_THREADS))
         avctx->thread_count = 1;
@@ -1024 +1028 @@
     av_dict_free(&tmp);
     av_freep(&avctx->priv_data);
     if (avctx->internal) {
+        if (needFrameThreadEncoderFreeOnError
+           && avctx->internal->frame_thread_encoder)
+        {
+            ff_frame_thread_encoder_free(avctx);
+        }
+        if (needThreadFreeOnError
+           && avctx->internal->thread_ctx)
+        {
+            ff_thread_free(avctx);
+        }
         av_frame_free(&avctx->internal->to_free);
         av_frame_free(&avctx->internal->compat_decode_frame);
         av_frame_free(&avctx->internal->buffer_frame);