mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avconv: move the avcodec_find_decoder() call to add_input_streams().
This makes the code simpler to understand, though it results in an unnecessary call to avcodec_find_decoder() if the stream won't be decoded.
This commit is contained in:
parent
45ecda8554
commit
c74b44de08
4
avconv.c
4
avconv.c
@ -1825,8 +1825,6 @@ static int init_input_stream(int ist_index, OutputStream *output_streams, int nb
|
||||
InputStream *ist = &input_streams[ist_index];
|
||||
if (ist->decoding_needed) {
|
||||
AVCodec *codec = ist->dec;
|
||||
if (!codec)
|
||||
codec = avcodec_find_decoder(ist->st->codec->codec_id);
|
||||
if (!codec) {
|
||||
snprintf(error, sizeof(error), "Decoder (codec id %d) not found for input stream #%d.%d",
|
||||
ist->st->codec->codec_id, ist->file_index, ist->st->index);
|
||||
@ -2895,6 +2893,8 @@ static void add_input_streams(AVFormatContext *ic)
|
||||
ist->ts_scale = strtod(scale, NULL);
|
||||
|
||||
ist->dec = choose_codec(ic, st, dec->codec_type, codec_names);
|
||||
if (!ist->dec)
|
||||
ist->dec = avcodec_find_decoder(dec->codec_id);
|
||||
|
||||
switch (dec->codec_type) {
|
||||
case AVMEDIA_TYPE_AUDIO:
|
||||
|
Loading…
Reference in New Issue
Block a user