[FFmpeg-devel] [PATCH 14/25] fftools/ffmpeg: open decoders right after we know they are needed
Anton Khirnov
anton at khirnov.net
Thu Apr 13 17:12:12 EEST 2023
Will allow initializing subtitle encoding earlier.
---
fftools/ffmpeg.c | 5 -----
fftools/ffmpeg_demux.c | 6 ++++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index d8b06eb724..900d6e5e83 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1882,11 +1882,6 @@ static int transcode_init(void)
ifile->streams[j]->start = av_gettime_relative();
}
- /* init input streams */
- for (InputStream *ist = ist_iter(NULL); ist; ist = ist_iter(ist))
- if (ist->decoding_needed && (ret = dec_open(ist)) < 0)
- goto dump_format;
-
/*
* initialize stream copy and subtitle/data streams.
* Encoded AVFrame based streams will get initialized when the first AVFrame
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index d15a714e90..91609509b2 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -566,6 +566,12 @@ static void ist_use(InputStream *ist, int decoding_needed)
ist->discard = 0;
ist->st->discard = ist->user_set_discard;
ist->decoding_needed |= decoding_needed;
+
+ if (decoding_needed && !avcodec_is_open(ist->dec_ctx)) {
+ int ret = dec_open(ist);
+ if (ret < 0)
+ report_and_exit(ret);
+ }
}
void ist_output_add(InputStream *ist, OutputStream *ost)
--
2.39.1
More information about the ffmpeg-devel
mailing list