summaryrefslogtreecommitdiff
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:23:46 +0100
commitd8b37664d524251ac524c780c0f978fb48ce4b2d (patch)
tree052b688931877c6803da20d27f1f3e8bedcf8400
parent41f97fe378e3d2b79feaa1460e85865edafe08f9 (diff)
downloadffmpeg-d8b37664d524251ac524c780c0f978fb48ce4b2d.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 29bd9999b5..35904ab8fd 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1021,7 +1021,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;