From d309f0195040db62f462e8bd68203fd38b274158 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sat, 31 Jul 2010 18:48:48 +0000 Subject: 10l: fix bit count for frame header Originally committed as revision 24627 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/flacenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec/flacenc.c') diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index d9f9251c9e..7d1e773781 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -945,7 +945,10 @@ static int count_frame_header(FlacEncodeContext *s) PUT_UTF8(s->frame_count, tmp, count += 8;) /* explicit block size */ - count += FFMAX(0, s->frame.bs_code[0] - 5) * 8; + if (s->frame.bs_code[0] == 6) + count += 8; + else if (s->frame.bs_code[0] == 7) + count += 16; /* explicit sample rate */ count += ((s->sr_code[0] == 12) + (s->sr_code[0] > 12)) * 8; -- cgit v1.2.3