upgrade to ffmpeg 4.2, rework mask for speedup

[goodguy/cinelerra.git] / cinelerra-5.1 / thirdparty / src / ffmpeg-4.2.patch7

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch7 b/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch7
new file mode 100644 (file)
index 0000000..55d918a
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch7
@@ -0,0 +1,12 @@
+diff -ru a/libavcodec/h263dec.c b/libavcodec/h263dec.c
+--- a/libavcodec/h263dec.c     2019-08-05 14:52:21.000000000 -0600
++++ b/libavcodec/h263dec.c     2019-08-08 18:20:39.255383087 -0600
+@@ -684,7 +684,7 @@
+     if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4)
+         ff_mpeg4_frame_end(avctx, buf, buf_size);
+ 
+-    if (!s->divx_packed && avctx->hwaccel)
++    if (s->divx_packed && avctx->hwaccel)
+         ff_thread_finish_setup(avctx);
+ 
+     av_assert1(s->current_picture.f->pict_type == s->current_picture_ptr->f->pict_type);