Display error message when user attempts to resample non-S16 audio formats.
authorPeter Ross <pross@xvid.org>
Sun, 31 Aug 2008 07:23:48 +0000 (07:23 +0000)
committerPeter Ross <pross@xvid.org>
Sun, 31 Aug 2008 07:23:48 +0000 (07:23 +0000)
Patch supplied by Daniel Serpell <daniel dot serpell at gmail dotcom>.

Originally committed as revision 15119 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 3c683dc..91dca40 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -537,6 +537,10 @@ static void do_audio_out(AVFormatContext *s,
         ost->audio_resample = 1;
 
     if (ost->audio_resample && !ost->resample) {
+        if (dec->sample_fmt != SAMPLE_FMT_S16) {
+            fprintf(stderr, "Audio resampler only works with 16 bits per sample, patch welcome.\n");
+            av_exit(1);
+        }
         ost->resample = audio_resample_init(enc->channels,    dec->channels,
                                             enc->sample_rate, dec->sample_rate);
         if (!ost->resample) {