virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

fftools/ffmpeg: open decoders right after we know they are needed

Browse Source 
Will allow initializing subtitle encoding earlier.
This commit is contained in:
Anton Khirnov 2023-04-11 13:27:44 +02:00
parent c8fa58430e
commit 2058402e00
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fftools/ffmpeg.c
View File

@ -1882,11 +1882,6 @@ static int transcode_init(void)
ifile->streams[j]->start = av_gettime_relative(); 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. * initialize stream copy and subtitle/data streams.
* Encoded AVFrame based streams will get initialized when the first AVFrame * Encoded AVFrame based streams will get initialized when the first AVFrame

6
fftools/ffmpeg_demux.c
View File

@ -566,6 +566,12 @@ static void ist_use(InputStream *ist, int decoding_needed)
ist->discard = 0; ist->discard = 0;
ist->st->discard = ist->user_set_discard; ist->st->discard = ist->user_set_discard;
ist->decoding_needed |= decoding_needed; 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) void ist_output_add(InputStream *ist, OutputStream *ost)