no longer need ffmpeg patch0 which was for Termux

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

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
index 231e05f568fdb22daef34d9e324c45c5cd23c09f..379ddb6229a1f54e5dad41696a9577dcfce41778 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
@@ -1,12 +1,10 @@
-diff -urN a/libavcodec/h263dec.c b/libavcodec/h263dec.c
---- a/libavcodec/h263dec.c     2019-12-02 08:48:02.926360820 -0700
-+++ b/libavcodec/h263dec.c     2019-12-02 08:52:52.428339509 -0700
-@@ -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);
+--- a/libavcodec/vdpau_mpeg12.c
++++ b/libavcodec/vdpau_mpeg12.c
+@@ -117,6 +117,7 @@
+     .frame_priv_data_size = sizeof(struct vdpau_picture_context),
+     .init           = vdpau_mpeg1_init,
+     .uninit         = ff_vdpau_common_uninit,
++    .frame_params   = ff_vdpau_common_frame_params,
+     .priv_data_size = sizeof(VDPAUContext),
+     .caps_internal  = HWACCEL_CAP_ASYNC_SAFE,
+ };