[FFmpeg-cvslog] fftools/ffmpeg: return an error instead of aborting

Anton Khirnov git at videolan.org
Sat Jul 15 12:03:06 EEST 2023


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Jul 12 19:48:05 2023 +0200| [5fe3914c391699c05cbd7a09f38f318d0452f1df] | committer: Anton Khirnov

fftools/ffmpeg: return an error instead of aborting

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

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

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 96638242f3..68924d21e0 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1094,7 +1094,7 @@ static int process_input(int file_index)
             av_log(ifile, AV_LOG_ERROR,
                    "Error retrieving a packet from demuxer: %s\n", av_err2str(ret));
             if (exit_on_error)
-                exit_program(1);
+                return ret;
         }
 
         for (i = 0; i < ifile->nb_streams; i++) {



More information about the ffmpeg-cvslog mailing list