virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ffmpeg: Fix typos introduced in:

Browse Source 
commit 630902a1e1
	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>
This commit is contained in:
Michael Niedermayer 2011-09-01 03:46:04 +02:00
parent a538e0f9a0
commit 3584b01e4e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg.c
View File

@ -1888,12 +1888,12 @@ static int init_input_stream(int ist_index, OutputStream *output_streams, int nb
if (ist->decoding_needed) { if (ist->decoding_needed) {
AVCodec *codec = ist->dec; AVCodec *codec = ist->dec;
if (!codec) { 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); avcodec_get_name(ist->st->codec->codec_id), ist->file_index, ist->st->index);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (avcodec_open2(ist->st->codec, codec, &ist->opts) < 0) { 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); ist->file_index, ist->st->index);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -2199,7 +2199,7 @@ static int transcode_init(OutputFile *output_files,
/* init input streams */ /* init input streams */
for (i = 0; i < nb_input_streams; i++) 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; goto dump_format;
/* open files and write file headers */ /* open files and write file headers */