summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Abeni <lucabe72@email.it>2005-07-22 22:24:41 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-07-22 22:24:41 +0000
commitf2d9a9f5b7fac102fa5bbdd4095a5fb2d0420d45 (patch)
treee36919fd6a67bf8afa22f1baf50c59c8b9567b06
parentcad4368af7d6535247da7329131e2e34fef1230b (diff)
let user set codec even if CODEC_ID_NONE is default patch by (Luca Abeni: lucabe72, email it)
Originally committed as revision 4466 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index c86f61d8c4..beb44ce062 100644
--- 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 */