[FFmpeg-cvslog] fftools/ffplay: replace report_and_exit() with returning an error code

Anton Khirnov git at videolan.org
Thu Jul 20 21:57:46 EEST 2023


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Jul 14 18:26:07 2023 +0200| [78699923ac8ab8c2de1ba64c464385a9e12258ed] | committer: Anton Khirnov

fftools/ffplay: replace report_and_exit() with returning an error code

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

 fftools/ffplay.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index a491fdd9e3..5212ad053e 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -2784,8 +2784,12 @@ static int read_thread(void *arg)
         int orig_nb_streams = ic->nb_streams;
 
         err = setup_find_stream_info_opts(ic, codec_opts, &opts);
-        if (err < 0)
-            report_and_exit(err);
+        if (err < 0) {
+            av_log(NULL, AV_LOG_ERROR,
+                   "Error setting up avformat_find_stream_info() options\n");
+            ret = err;
+            goto fail;
+        }
 
         err = avformat_find_stream_info(ic, opts);
 



More information about the ffmpeg-cvslog mailing list