[SCM] libav/experimental: Don't try to demux WavPack files with >2 channels until we can support them

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 614e139a11198eb692ec68f30820adf3ec0f629d
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Tue Dec 7 18:15:06 2010 +0000

    Don't try to demux WavPack files with >2 channels until we can support them
    
    Originally committed as revision 25919 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/wv.c b/libavformat/wv.c
index 03b864b..5692230 100644
--- a/libavformat/wv.c
+++ b/libavformat/wv.c
@@ -101,6 +101,10 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb)
     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)){

-- 
Libav/FFmpeg packaging