From d08e3e91af7238db491d9a9b7c83827ac127ccb3 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Sat, 12 Jul 2008 11:43:21 +0000 Subject: [PATCH] Prevent users from setting -vol and -acodec copy together. They are incompatible since the frames are not decoded, so they can't be preprocessed. Originally committed as revision 14178 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index bcd9358b46..fcd6dd40c1 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1686,6 +1686,10 @@ static int av_encode(AVFormatContext **output_files, codec->time_base = ist->st->time_base; switch(codec->codec_type) { case CODEC_TYPE_AUDIO: + if(audio_volume != 256) { + fprintf(stderr,"-acodec copy and -vol are incompatible (frames are not decoded)\n"); + av_exit(1); + } codec->sample_rate = icodec->sample_rate; codec->channels = icodec->channels; codec->frame_size = icodec->frame_size;