From a3d2379bdd821eec60f20ee3945047d659894bda Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 4 Mar 2009 23:10:40 +0000 Subject: [PATCH] flacdec: Check curr_bps after wasted bits are subtracted. Originally committed as revision 17813 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/flacdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index b8ae73fea9..73e524a55d 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -432,10 +432,6 @@ static inline int decode_subframe(FLACContext *s, int channel) if (s->decorrelation == LEFT_SIDE || s->decorrelation == MID_SIDE) s->curr_bps++; } - if (s->curr_bps > 32) { - ff_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0); - return -1; - } if (get_bits1(&s->gb)) { av_log(s->avctx, AV_LOG_ERROR, "invalid subframe padding\n"); @@ -449,6 +445,10 @@ static inline int decode_subframe(FLACContext *s, int channel) wasted++; s->curr_bps -= wasted; } + if (s->curr_bps > 32) { + ff_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0); + return -1; + } //FIXME use av_log2 for types if (type == 0) {