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.1.4.patch7 b/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch7
similarity index 63%
rename from cinelerra-5.1/thirdparty/src/ffmpeg-4.1.4.patch7
rename to cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch7
index df7bb461aecadf8b4159ccfa56fe76683e3e1dc5..55d918a88ee20dedce8df8a72df58a3783217645 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg-4.1.4.patch7
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg-4.2.patch7
@@ -1,7 +1,7 @@
-diff -urN a/libavcodec/h263dec.c b/libavcodec/h263dec.c
---- a/libavcodec/h263dec.c
-+++ b/libavcodec/h263dec.c
-@@ -684,7 +684,7 @@ frame_end:
+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 (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4)
          ff_mpeg4_frame_end(avctx, buf, buf_size);