Commit f2d9a9f5 authored by Luca Abeni's avatar Luca Abeni Committed by Michael Niedermayer
Browse files

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
parent cad4368a
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment