[FFmpeg-cvslog] latm: Always reconfigure if no extradata was set previously

[Hendrik Leppkes]

ffmpeg | branch: release/2.2 | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Dec 23 00:14:32 2011 +0100| [031d3b66c2ea3b338cb7ce437bce47a8a4930ebb] | committer: Reinhard Tartler

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 at gentoo.org>
(cherry picked from commit 3aca10bf762a94d7de555cedf1ff0e4f6792bf41)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=031d3b66c2ea3b338cb7ce437bce47a8a4930ebb
---

 libavcodec/aacdec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index a365209..e25838f 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");