let user set codec even if CODEC_ID_NONE is default patch by (Luca Abeni: lucabe72...

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

diff --git a/ffmpeg.c b/ffmpeg.c
index c86f61d8c4824e088dbd45fe60fee2a9fd906141..beb44ce0629cdd6e98347d678ef72ef2765fa5bc 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3607,8 +3607,8 @@ static void opt_output_file(const char *filename)
             exit(1);
         }
     } else {
-        use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy;
-        use_audio = file_oformat->audio_codec != CODEC_ID_NONE || audio_stream_copy;
+        use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy || video_codec_id != CODEC_ID_NONE;
+        use_audio = file_oformat->audio_codec != CODEC_ID_NONE || audio_stream_copy || audio_codec_id != CODEC_ID_NONE;
 
         /* disable if no corresponding type found and at least one
            input file */