update ffmpeg.git files for newer versions

[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 51bc09e3115252c94607bf3f088f4b7a07eb1213..1a9476c7629ab44d6533bf9515866ee130a35098 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8
@@ -1,16 +1,11 @@
-diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
-index 9bd0a555d4..111a9f3a46 100644
---- a/libavformat/mpegenc.c
-+++ b/libavformat/mpegenc.c
-@@ -976,9 +976,9 @@ static int remove_decoded_packets(AVFormatContext *ctx, int64_t scr)
-         PacketDesc *pkt_desc;
+--- a/libavcodec/h263dec.c
++++ b/libavcodec/h263dec.c
+@@ -685,7 +685,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);