projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a854bcd
)
Don't try to demux WavPack files with >2 channels until we can support them
author
Kostya Shishkov
<kostya.shishkov@gmail.com>
Tue, 7 Dec 2010 18:15:06 +0000
(18:15 +0000)
committer
Kostya Shishkov
<kostya.shishkov@gmail.com>
Tue, 7 Dec 2010 18:15:06 +0000
(18:15 +0000)
Originally committed as revision 25919 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/wv.c
patch
|
blob
|
history
diff --git
a/libavformat/wv.c
b/libavformat/wv.c
index
03b864b
..
5692230
100644
(file)
--- 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)){