[FFmpeg-cvslog] r14178 - trunk/ffmpeg.c

[ramiro]

Author: ramiro
Date: Sat Jul 12 13:43:21 2008
New Revision: 14178

Log:
Prevent users from setting -vol and -acodec copy together.
They are incompatible since the frames are not decoded, so they can't be preprocessed.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Sat Jul 12 13:43:21 2008
@@ -1686,6 +1686,10 @@ static int av_encode(AVFormatContext **o
                 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;