[FFmpeg-cvslog] fftools/ffmpeg: rename transcode_init()

Anton Khirnov git at videolan.org
Mon May 15 15:16:53 EEST 2023


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun May  7 19:38:51 2023 +0200| [7be945a011917f3cff0ca8d7c09e0a71fe31d2c2] | committer: Anton Khirnov

fftools/ffmpeg: rename transcode_init()

It does no initialization anymore, except for setting
transcode_init_done - the bulk of the function is printing the
input/output maps. It also cannot fail anymore, so remove the useless
return value.

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

 fftools/ffmpeg.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 45efa75047..ebd793a98c 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1493,11 +1493,8 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
     return !eof_reached;
 }
 
-static int transcode_init(void)
+static void print_stream_maps(void)
 {
-    int ret = 0;
-
-    /* dump the stream mapping */
     av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
     for (InputStream *ist = ist_iter(NULL); ist; ist = ist_iter(ist)) {
         for (int j = 0; j < ist->nb_filters; j++) {
@@ -1570,13 +1567,6 @@ static int transcode_init(void)
             av_log(NULL, AV_LOG_INFO, " (copy)");
         av_log(NULL, AV_LOG_INFO, "\n");
     }
-
-    if (ret)
-        return ret;
-
-    atomic_store(&transcode_init_done, 1);
-
-    return 0;
 }
 
 /**
@@ -1854,9 +1844,9 @@ static int transcode(void)
     InputStream *ist;
     int64_t timer_start;
 
-    ret = transcode_init();
-    if (ret < 0)
-        return ret;
+    print_stream_maps();
+
+    atomic_store(&transcode_init_done, 1);
 
     if (stdin_interaction) {
         av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");



More information about the ffmpeg-cvslog mailing list