RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: remove pointless if (nb_input_files) 

It's required to be non-zero since
cc58300e30
This commit is contained in:
Anton Khirnov 2011-06-24 08:54:52 +02:00
parent 27e91f37f5
commit 20f9f21fd4
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ffmpeg.c
View File

@ -3821,23 +3821,20 @@ static void opt_output_file(const char *filename)
use_subtitle = file_oformat->subtitle_codec != CODEC_ID_NONE || subtitle_stream_copy || subtitle_codec_name; use_subtitle = file_oformat->subtitle_codec != CODEC_ID_NONE || subtitle_stream_copy || subtitle_codec_name;
use_data = data_stream_copy || data_codec_name; /* XXX once generic data codec will be available add a ->data_codec reference and use it here */ use_data = data_stream_copy || data_codec_name; /* XXX once generic data codec will be available add a ->data_codec reference and use it here */
/* disable if no corresponding type found and at least one /* disable if no corresponding type found */
input file */ check_inputs(&input_has_video,
if (nb_input_files > 0) { &input_has_audio,
check_inputs(&input_has_video, &input_has_subtitle,
&input_has_audio, &input_has_data);
&input_has_subtitle,
&input_has_data);
if (!input_has_video) if (!input_has_video)
use_video = 0; use_video = 0;
if (!input_has_audio) if (!input_has_audio)
use_audio = 0; use_audio = 0;
if (!input_has_subtitle) if (!input_has_subtitle)
use_subtitle = 0; use_subtitle = 0;
if (!input_has_data) if (!input_has_data)
use_data = 0; use_data = 0;
}
/* manual disable */ /* manual disable */
if (audio_disable) use_audio = 0; if (audio_disable) use_audio = 0;