[FFmpeg-cvslog] Don't allow unsupported resampling configurations.

[Alex Converse]

ffmpeg | branch: master | Alex Converse <aconverse at google.com> | Tue May 10 15:10:31 2011 -0700| [918a5409532e1218b011b5c079beb4eb5f45fdd4] | committer: Alex Converse

Don't allow unsupported resampling configurations.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=918a5409532e1218b011b5c079beb4eb5f45fdd4
---

 libavcodec/resample.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index 2185a11..9f0599f 100644
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -156,6 +156,11 @@ ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
         av_log(NULL, AV_LOG_ERROR, "Resampling with input channels greater than 2 unsupported.\n");
         return NULL;
       }
+    if (output_channels > 2 && !(output_channels == 6 && input_channels == 2)) {
+        av_log(NULL, AV_LOG_ERROR,
+               "Resampling output channel count must be 1 or 2 for mono input and 1, 2 or 6 for stereo input.\n");
+        return NULL;
+    }
 
     s = av_mallocz(sizeof(ReSampleContext));
     if (!s)