[FFmpeg-cvslog] ffmpeg: remove pointless if (nb_input_files)
Anton Khirnov
git at videolan.org
Sat Jul 9 02:09:52 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Jun 24 08:54:52 2011 +0200| [20f9f21fd49112c70c94dad015550f59ece5a0e9] | committer: Anton Khirnov
ffmpeg: remove pointless if (nb_input_files)
It's required to be non-zero since
cc58300e30e7aea6acfecd72a04a3886b285cfd8
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20f9f21fd49112c70c94dad015550f59ece5a0e9
---
ffmpeg.c | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 3907855..9ae197a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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_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
- input file */
- if (nb_input_files > 0) {
- check_inputs(&input_has_video,
- &input_has_audio,
- &input_has_subtitle,
- &input_has_data);
-
- if (!input_has_video)
- use_video = 0;
- if (!input_has_audio)
- use_audio = 0;
- if (!input_has_subtitle)
- use_subtitle = 0;
- if (!input_has_data)
- use_data = 0;
- }
+ /* disable if no corresponding type found */
+ check_inputs(&input_has_video,
+ &input_has_audio,
+ &input_has_subtitle,
+ &input_has_data);
+
+ if (!input_has_video)
+ use_video = 0;
+ if (!input_has_audio)
+ use_audio = 0;
+ if (!input_has_subtitle)
+ use_subtitle = 0;
+ if (!input_has_data)
+ use_data = 0;
/* manual disable */
if (audio_disable) use_audio = 0;
More information about the ffmpeg-cvslog
mailing list