[FFmpeg-cvslog] r26253 - trunk/libavcodec/wavpack.c

[cehoyos]

Author: cehoyos
Date: Fri Jan  7 14:24:58 2011
New Revision: 26253

Log:
Fail more gracefully for multichannel wavpack in another container.

Modified:
   trunk/libavcodec/wavpack.c

Modified: trunk/libavcodec/wavpack.c
==============================================================================
--- trunk/libavcodec/wavpack.c	Fri Jan  7 11:16:00 2011	(r26252)
+++ trunk/libavcodec/wavpack.c	Fri Jan  7 14:24:58 2011	(r26253)
@@ -660,6 +660,10 @@ static av_cold int wavpack_decode_init(A
     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;