1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-20 16:25:04 +02:00

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
This commit is contained in:
Luca Abeni 2005-07-22 22:24:41 +00:00 committed by Michael Niedermayer
parent cad4368af7
commit f2d9a9f5b7

View File

@ -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 */