[SCM] libav/experimental: Handle WavPack INT32INFO chunks with nonzero post shift
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:44:54 UTC 2013
The following commit has been merged in the experimental branch:
commit 6e0f746d3eac0b07b9f5e4216d45ad70ca17fe62
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date: Thu Apr 23 18:21:16 2009 +0000
Handle WavPack INT32INFO chunks with nonzero post shift
Originally committed as revision 18668 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 4a7a9e5..e0db016 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -780,12 +780,14 @@ static int wavpack_decode_frame(AVCodecContext *avctx,
got_hybrid = 1;
break;
case WP_ID_INT32INFO:
- if(size != 4 || *buf){
+ if(size != 4){
av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
buf += ssize;
continue;
}
- if(buf[1])
+ if(buf[0])
+ s->post_shift = buf[0];
+ else if(buf[1])
s->shift = buf[1];
else if(buf[2]){
s->and = s->or = 1;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list