summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2011-12-23 00:14:32 +0100
committerLuca Barbato <lu_zero@gentoo.org>2014-02-28 14:51:20 +0100
commit3aca10bf762a94d7de555cedf1ff0e4f6792bf41 (patch)
treee7ff16fcf44e6bf201f3d45699358c80b66f8aaa
parent6e4009d4cdf5927bdaedf58fcfc5e813b14c366b (diff)
latm: Always reconfigure if no extradata was set previously
AAC LOAS can have new audio config objects in the stream itself. Make sure the decoder reconfigures itself when the first one arrives midstream. Bug-Id: 644 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/aacdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index a3652098db..e25838fca0 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -3030,7 +3030,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
if (bits_consumed < 0)
return AVERROR_INVALIDDATA;
- if (ac->oc[1].m4ac.sample_rate != m4ac.sample_rate ||
+ if (!latmctx->initialized ||
+ ac->oc[1].m4ac.sample_rate != m4ac.sample_rate ||
ac->oc[1].m4ac.chan_config != m4ac.chan_config) {
av_log(avctx, AV_LOG_INFO, "audio config changed\n");