[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.339,1.340

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv15603

Modified Files:
	ffmpeg.c 
Log Message:
let user set codec even if CODEC_ID_NONE is default patch by (Luca Abeni: lucabe72, email it)


Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -d -r1.339 -r1.340
--- ffmpeg.c	17 Jul 2005 22:24:34 -0000	1.339
+++ ffmpeg.c	22 Jul 2005 22:24:41 -0000	1.340
@@ -3607,8 +3607,8 @@
             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 */