aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2016-01-24 20:47:49 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-31 00:24:52 +0100
commitd7c0287fbdac7d52f441f2017c55f5e0483c077e (patch)
treeb4425d562ee051d1c1c718707d60cc63a91cb550
parent7bcf142c02e0b3f462b61a1377e963c6366597e7 (diff)
downloadffmpeg-d7c0287fbdac7d52f441f2017c55f5e0483c077e.tar.gz
avcodec/flacenc: fix calculation of bits required in case of custom sample rate
Sample rate of 11025 takes 16 bits but previous code would pick only 8. Fixes assertion failure. Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 3e7d6849120d61bb354376d52786c26f20e20835) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/flacenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index e66ef3db5e..5d3e002aa9 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -916,7 +916,7 @@ static int count_frame_header(FlacEncodeContext *s)
count += 16;
/* explicit sample rate */
- count += ((s->sr_code[0] == 12) + (s->sr_code[0] > 12)) * 8;
+ count += ((s->sr_code[0] == 12) + (s->sr_code[0] > 12) * 2) * 8;
/* frame header CRC-8 */
count += 8;