diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-23 18:26:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-23 18:26:37 +0200 |
commit | 4ca6a151e0c48f2729027ac263269cb50e88ed71 (patch) | |
tree | 1307128caf78999abcf1600fd0fa8224770baa3b /avconv.c | |
parent | 276f43be68617c0d56001abf1e213911dd51fed7 (diff) | |
parent | bc8c50512fc8550ae80535390379e00937623e00 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: print the codecs names in the stream mapping.
avconv: move the avcodec_find_decoder() call to add_input_streams().
Windows Media Image decoder (WMVP/WVP2)
ac3enc: remove outdated TODO comment for apply_channel_coupling()
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/vc1dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1895,8 +1895,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); @@ -2250,6 +2248,10 @@ static int transcode_init(OutputFile *output_files, ost->sync_ist->st->index); if (ost->st->stream_copy) fprintf(stderr, " (copy)"); + else + fprintf(stderr, " (%s -> %s)", input_streams[ost->source_index].dec ? + input_streams[ost->source_index].dec->name : "?", + ost->enc ? ost->enc->name : "?"); fprintf(stderr, "\n"); } } @@ -3004,6 +3006,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: |