Credit ffmpeg team with upgrade to 6.1

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

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-6.1.patchC b/cinelerra-5.1/thirdparty/src/ffmpeg-6.1.patchC
new file mode 100644 (file)
index 0000000..56df39c
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg-6.1.patchC
@@ -0,0 +1,41 @@
+--- a/libavcodec/encode.c
++++ b/libavcodec/encode.c
+@@ -331,7 +331,7 @@
+     }
+ 
+     if (!frame->buf[0]) {
+-        if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY ||
++        if (avci->draining && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY ||
+               avci->frame_thread_encoder))
+             return AVERROR_EOF;
+ 
+@@ -350,8 +350,10 @@
+         ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet);
+     }
+ 
+-    if (avci->draining && !got_packet)
++    if (avci->draining && !got_packet) {
++       fflush(stderr);
+         avci->draining_done = 1;
++    }
+ 
+     return ret;
+ }
+@@ -526,10 +528,16 @@
+     if (avci->draining)
+         return AVERROR_EOF;
+ 
+-    if (avci->buffer_frame->buf[0])
++    if (avci->buffer_frame->buf[0]) {
++        if (!frame) {
++           fflush(stderr);
++            av_frame_unref(avci->buffer_frame);
++       }
+         return AVERROR(EAGAIN);
++    }
+ 
+     if (!frame) {
++       fflush(stderr);
+         avci->draining = 1;
+     } else {
+         ret = encode_send_frame_internal(avctx, frame);