summaryrefslogtreecommitdiff
path: root/libavformat/latmenc.c
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-10-21 17:25:30 +0200
committerJanne Grunau <janne-libav@jannau.net>2011-12-03 00:42:48 +0100
commitfd095539d10bb440042e671f95306b16b0fec674 (patch)
treec28e329a98879823371f7b3e3f388f83f3805fab /libavformat/latmenc.c
parent0eea212943544d40f99b05571aa7159d78667154 (diff)
latmdec: fix audio specific config parsing
Pass the correct size in bits to mpeg4audio_get_config and add a flag to disable parsing of the sync extension when the size is not known. Latm with AudioMuxVersion 0 does not specify the size of the audio specific config. Data after the audio specific config can be misinterpreted as sync extension resulting in random and wrong configs.
Diffstat (limited to 'libavformat/latmenc.c')
-rw-r--r--libavformat/latmenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index 679f2cc9c6..423710ddea 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -54,7 +54,7 @@ static int latm_decode_extradata(LATMContext *ctx, uint8_t *buf, int size)
MPEG4AudioConfig m4ac;
init_get_bits(&gb, buf, size * 8);
- ctx->off = avpriv_mpeg4audio_get_config(&m4ac, buf, size);
+ ctx->off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1);
if (ctx->off < 0)
return ctx->off;
skip_bits_long(&gb, ctx->off);