X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2Fsrc%2Fffmpeg.git.patch7;h=17f2f0500886281f00e7502a2a8e7ec3b90f2d01;hb=5f4783cf32ed1dd15dc023668284e95028080403;hp=05d3b1d04e43d0c8c4876695f526eb44f4aa4881;hpb=8a5c77cd787cd083c94a8f538dbbc0d548460646;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
index 05d3b1d0..17f2f050 100644
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
@@ -1,13 +1,10 @@
-diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
-index 3b29a189e9..681a4187c5 100644
---- a/libavcodec/h263dec.c
-+++ b/libavcodec/h263dec.c
-@@ -684,7 +684,7 @@ frame_end:
-     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
++++ a/libavcodec/vdpau_mpeg12.c
+@@ -116,6 +116,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,
+ };