[FFmpeg-cvslog] r25919 - trunk/libavformat/wv.c

[kostya]

Author: kostya
Date: Tue Dec  7 19:15:06 2010
New Revision: 25919

Log:
Don't try to demux WavPack files with >2 channels until we can support them

Modified:
   trunk/libavformat/wv.c

Modified: trunk/libavformat/wv.c
==============================================================================
--- trunk/libavformat/wv.c	Tue Dec  7 17:42:25 2010	(r25918)
+++ trunk/libavformat/wv.c	Tue Dec  7 19:15:06 2010	(r25919)
@@ -101,6 +101,10 @@ static int wv_read_block_header(AVFormat
     bpp = ((wc->flags & 3) + 1) << 3;
     chan = 1 + !(wc->flags & WV_MONO);
     rate = wv_rates[(wc->flags >> 23) & 0xF];
+    if((wc->flags & 0x1800) != 0x1800){
+        av_log(ctx, AV_LOG_ERROR, "Multichannel WavPack is not supported yet.\n");
+        return -1;
+    }
     if(rate == -1 && !wc->block_parsed){
         int64_t block_end = url_ftell(pb) + wc->blksize - 24;
         if(url_is_streamed(pb)){