[FFmpeg-cvslog] fftools/ffmpeg: do not fail on AVERROR(EAGAIN) from choose_output()

Anton Khirnov git at videolan.org
Thu Sep 14 11:46:18 EEST 2023


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Sep  5 11:04:31 2023 +0200| [ced62a0c010f74a713fa7f93c115e2284e22f96c] | committer: Anton Khirnov

fftools/ffmpeg: do not fail on AVERROR(EAGAIN) from choose_output()

This is not an error condition, but would be treated like one if the
program terminates on the next transcode loop iteration because of a
signal or keyboard input.

Fixes #10504
Tested-by: https://github.com/0Ky

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ced62a0c010f74a713fa7f93c115e2284e22f96c
---

 fftools/ffmpeg.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index f1c5f40caf..fd2ce1c2d0 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1196,6 +1196,7 @@ static int transcode(int *err_rate_exceeded)
         if (ret == AVERROR(EAGAIN)) {
             reset_eagain();
             av_usleep(10000);
+            ret = 0;
             continue;
         } else if (ret < 0) {
             av_log(NULL, AV_LOG_VERBOSE, "No more output streams to write to, finishing.\n");



More information about the ffmpeg-cvslog mailing list