cook: Fix js_vlc_bits value validation for joint stereo

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
13 years ago · 3a742470a8
parent 1775b92fee
commit 3a742470a8
1 changed files with 3 additions and 2 deletions
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@ -1174,8 +1174,9 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
            return -1;
        }

-        if ((q->subpacket[s].js_vlc_bits > 6) || (q->subpacket[s].js_vlc_bits < 0)) {
-            av_log(avctx,AV_LOG_ERROR,"js_vlc_bits = %d, only >= 0 and <= 6 allowed!\n",q->subpacket[s].js_vlc_bits);
+        if ((q->subpacket[s].js_vlc_bits > 6) || (q->subpacket[s].js_vlc_bits < 2*q->subpacket[s].joint_stereo)) {
+            av_log(avctx,AV_LOG_ERROR,"js_vlc_bits = %d, only >= %d and <= 6 allowed!\n",
+                   q->subpacket[s].js_vlc_bits, 2*q->subpacket[s].joint_stereo);
            return -1;
        }