diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-01 22:08:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-01 22:08:44 +0200 |
| commit | 58677d73ed43020ea0840e633588e344396ee256 (patch) | |
| tree | ee96724ecd357d71717e99263c4104ad380b79bc /avconv.c | |
| parent | acc3c380cb010451e8e336b622e7ae446709d5c2 (diff) | |
| parent | 6248694861f0c414571fadba447a0c1cab95284e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
libmp3lame: fix typo
AVOptions: drop av_ prefix from static av_get_number().
libx264: use X264_THREADS_AUTO constant instead of 0.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'avconv.c')
| -rw-r--r-- | avconv.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1891,13 +1891,13 @@ static int init_input_stream(int ist_index, OutputStream *output_streams, int nb if (ist->decoding_needed) { AVCodec *codec = ist->dec; if (!codec) { - snprintf(error, sizeof(error), "Decoder (codec id %d) not found for input stream #%d.%d", + snprintf(error, error_len, "Decoder (codec id %d) not found for input stream #%d.%d", ist->st->codec->codec_id, ist->file_index, ist->st->index); return AVERROR(EINVAL); } if (avcodec_open2(ist->st->codec, codec, &ist->opts) < 0) { - snprintf(error, sizeof(error), "Error while opening decoder for input stream #%d.%d", + snprintf(error, error_len, "Error while opening decoder for input stream #%d.%d", ist->file_index, ist->st->index); return AVERROR(EINVAL); } @@ -2203,7 +2203,7 @@ static int transcode_init(OutputFile *output_files, /* init input streams */ for (i = 0; i < nb_input_streams; i++) - if ((ret = init_input_stream(i, output_streams, nb_output_streams, error, sizeof(error)) < 0)) + if ((ret = init_input_stream(i, output_streams, nb_output_streams, error, sizeof(error))) < 0) goto dump_format; /* open files and write file headers */ |