Commit f41a2264 authored by kostya's avatar kostya

Handle WavPack INT32INFO chunks with nonzero post shift

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18668 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ce39be8a
...@@ -780,12 +780,14 @@ static int wavpack_decode_frame(AVCodecContext *avctx, ...@@ -780,12 +780,14 @@ static int wavpack_decode_frame(AVCodecContext *avctx,
got_hybrid = 1; got_hybrid = 1;
break; break;
case WP_ID_INT32INFO: 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); av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
buf += ssize; buf += ssize;
continue; continue;
} }
if(buf[1]) if(buf[0])
s->post_shift = buf[0];
else if(buf[1])
s->shift = buf[1]; s->shift = buf[1];
else if(buf[2]){ else if(buf[2]){
s->and = s->or = 1; s->and = s->or = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment