diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-01 03:46:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-01 04:17:23 +0200 |
| commit | 3584b01e4e63cd9d05b82dee4859da5d463fb8e2 (patch) | |
| tree | f11128a9e1d35bbe71e07f1f315bb6eb2a3588b4 | |
| parent | a538e0f9a0c8f0bc2d4da99944997f6c0dcca503 (diff) | |
| download | ffmpeg-3584b01e4e63cd9d05b82dee4859da5d463fb8e2.tar.gz | |
ffmpeg: Fix typos introduced in:
commit 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
Author: Anton Khirnov <anton@khirnov.net>
Date: Wed Jul 6 08:49:07 2011 +0200
avconv: factor out initializing input streams.
These caused scrambled error messages to be printed and
floating point exceptions.
For example when there was no decoder available for a
stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1888,12 +1888,12 @@ 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 %s) not found for input stream #%d.%d", + snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d.%d", avcodec_get_name(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); } @@ -2199,7 +2199,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 */ |