diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-22 12:48:06 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-23 16:50:01 +0200 |
| commit | c74b44de08ffc2853f872c8a5d31526cdbacfc89 (patch) | |
| tree | c1b50f585b9978140273498cb9168ada1a8e6da7 /avconv.c | |
| parent | 45ecda855405f102bcc5d8fbadc5f2376e8e9c42 (diff) | |
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.
Diffstat (limited to 'avconv.c')
| -rw-r--r-- | avconv.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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: |