Fail more gracefully for multichannel wavpack in another container.

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

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 57534c9dfac883268a294e7bcf90eeebc99dc36f..779fe80e3ed3563e4ce9ba3042b8e34d13d43922 100644 (file)
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -660,6 +660,10 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx)
     WavpackContext *s = avctx->priv_data;
 
     s->avctx = avctx;
+    if (avctx->channels > 2) {
+        av_log(avctx, AV_LOG_ERROR, "Multichannel WavPack is not supported yet.\n");
+        return -1;
+    }
     s->stereo = (avctx->channels == 2);
     if(avctx->bits_per_coded_sample <= 16)
         avctx->sample_fmt = AV_SAMPLE_FMT_S16;