Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

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

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8
index 9518ad75d2fc2e0135d8152d79b6bc575db4cb0c..fcafebb829fa44edc64933a15016ac985478ef33 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8
@@ -1,14 +1,11 @@
---- a/libavformat/mpegenc.c    2019-08-05 14:52:21.000000000 -0600
-+++ /blibavformat/mpegenc.c    2019-11-14 14:07:57.407883232 -0700
-@@ -981,9 +981,9 @@
-         PacketDesc *pkt_desc;
+--- a/libavcodec/h263dec.c
++++ b/libavcodec/h263dec.c
+@@ -623,7 +623,7 @@
+     if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4)
+         ff_mpeg4_frame_end(avctx, buf, buf_size);
  
-         while ((pkt_desc = stream->predecode_packet) &&
-+               pkt_desc != stream->premux_packet &&
-                scr > pkt_desc->dts) { // FIXME: > vs >=
--            if (stream->buffer_index < pkt_desc->size ||
--                stream->predecode_packet == stream->premux_packet) {
-+            if (stream->buffer_index < pkt_desc->size) {
-                 av_log(ctx, AV_LOG_ERROR,
-                        "buffer underflow st=%d bufi=%d size=%d\n",
-                        i, stream->buffer_index, pkt_desc->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);