[FFmpeg-cvslog] Fix js_vlc_bits value validation when joint stereo is used in cook decoder.
Laurent Aimar
git at videolan.org
Sat Sep 17 19:40:17 CEST 2011
ffmpeg | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Sep 17 16:56:35 2011 +0200| [352c878de6fca57a3f2a6369e27ca442fa5f9518] | committer: Michael Niedermayer
Fix js_vlc_bits value validation when joint stereo is used in cook decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=352c878de6fca57a3f2a6369e27ca442fa5f9518
---
libavcodec/cook.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 6def1ac..0d09bb8 100644
--- 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;
}
More information about the ffmpeg-cvslog
mailing list