Cosmetics: use a more compact notation, improve readability and reduce

line count.

Originally committed as revision 25510 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

@@ -3730,27 +3730,13 @@ static void opt_output_file(const char *filename)
         }
 
         /* manual disable */
-        if (audio_disable) {
+        if (audio_disable)    use_audio    = 0;
-            use_audio = 0;
+        if (video_disable)    use_video    = 0;
-        }
+        if (subtitle_disable) use_subtitle = 0;
-        if (video_disable) {
-            use_video = 0;
-        }
-        if (subtitle_disable) {
-            use_subtitle = 0;
-        }
 
-        if (use_video) {
+        if (use_video)    new_video_stream(oc, nb_output_files);
-            new_video_stream(oc, nb_output_files);
+        if (use_audio)    new_audio_stream(oc, nb_output_files);
-        }
+        if (use_subtitle) new_subtitle_stream(oc, nb_output_files);
-
-        if (use_audio) {
-            new_audio_stream(oc, nb_output_files);
-        }
-
-        if (use_subtitle) {
-            new_subtitle_stream(oc, nb_output_files);
-        }
 
         oc->timestamp = recording_timestamp;