1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

aacenc: Write correct length for long identification strings.

When the length is the escape value (15), the new length is calculated by
15 + get_bits(8) - 1.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
This commit is contained in:
Michael Niedermayer
2012-01-23 13:05:03 -08:00
committed by Alex Converse
parent b8dd555c63
commit cdfe94c5ab

View File

@@ -462,7 +462,7 @@ static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s,
put_bits(&s->pb, 3, TYPE_FIL); put_bits(&s->pb, 3, TYPE_FIL);
put_bits(&s->pb, 4, FFMIN(namelen, 15)); put_bits(&s->pb, 4, FFMIN(namelen, 15));
if (namelen >= 15) if (namelen >= 15)
put_bits(&s->pb, 8, namelen - 16); put_bits(&s->pb, 8, namelen - 14);
put_bits(&s->pb, 4, 0); //extension type - filler put_bits(&s->pb, 4, 0); //extension type - filler
padbits = 8 - (put_bits_count(&s->pb) & 7); padbits = 8 - (put_bits_count(&s->pb) & 7);
avpriv_align_put_bits(&s->pb); avpriv_align_put_bits(&s->pb);