From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 22/22] fftools/ffmpeg: rename transcode_init() Date: Mon, 8 May 2023 11:17:38 +0200 Message-ID: <20230508091738.20813-22-anton@khirnov.net> (raw) In-Reply-To: <20230508091738.20813-1-anton@khirnov.net> 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. --- 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"); -- 2.39.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2023-05-08 9:19 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-08 9:17 [FFmpeg-devel] [PATCH 01/22] fftools/ffmpeg: consolidate InputStream.[next_]dts updates Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 02/22] fftools/ffmpeg: reindent after previous commit Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 03/22] fftools/ffmpeg: stop using decoder properties in ist_dts_update() Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 04/22] fftools/ffmpeg_demux: move preparing DemuxMsg to separate function Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 05/22] fftools/ffmpeg: attach InputStream.dts to demuxed packets when needed Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 06/22] fftools/ffmpeg: move post-demux packet processing to ffmpeg_demux Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 07/22] fftools/ffmpeg_demux: reindent after previous commit Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 08/22] fftools/ffmpeg: drop unused decode_video() parameter Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 09/22] fftools/ffmpeg_demux: move InputStream.{nb_packets, data_size} to private data Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 10/22] fftools/ffmpeg_demux: move InputStream.[saw_]first_d?ts " Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 11/22] fftools/ffmpeg_demux: move InputStream.[next_]dts " Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 12/22] fftools/ffmpeg_demux: move InputStream.wrap_correction_done " Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 13/22] fftools/ffmpeg_demux: move InputStream.streamcopy_needed " Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 14/22] fftools/ffmpeg: simplify tracking -readrate start time Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 15/22] fftools/ffmpeg: move discarding unused programs to ffmpeg_demux Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 16/22] fftools/ffmpeg_demux: reindent after previous commit Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 17/22] fftools/ffmpeg: replace print_error() by more meaningful messages Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 18/22] fftools/ffmpeg: log corrupt-frame errors to the appropriate context Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 19/22] fftools/ffmpeg: stop accessing input format from decoding code Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 20/22] fftools/ffmpeg_demux: move InputFile.ts_offset_discont, last_ts to private data Anton Khirnov 2023-05-08 9:17 ` [FFmpeg-devel] [PATCH 21/22] fftools/ffmpeg_demux: stop logging to demuxer context Anton Khirnov 2023-05-08 9:17 ` Anton Khirnov [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230508091738.20813-22-anton@khirnov.net \ --to=anton@khirnov.net \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git