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:24:28 +0100
commitf71e0b798a5091b98472a2f9a343283134240a31 (patch)
tree8eb30ccc24947e3c0922c2a0a75b8440d2c0835d
parente4b4f9e2dc30701386b32a33cc83c17dedeef041 (diff)
downloadffmpeg-f71e0b798a5091b98472a2f9a343283134240a31.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 78bd36ad39..c96609e609 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -920,7 +920,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;