Mercurial > mplayer.hg

diff libfaad2/decoder.c @ 25835:645cbba10a57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added AudioSpecificConfigFromBitfile() -that reads from an initizialized bitstream- and reimplemented AudioSpecificConfig() in terms of the former. Also, introduced a short_form parameter that indicates if the core function must pretend not to know the size of the header (another craziness in AAC)
author nicodvb
date Sat, 26 Jan 2008 18:42:17 +0000
parents 59b6fa5b4201
children bc425ba00960
line wrap: on
line diff
--- a/libfaad2/decoder.c	Sat Jan 26 18:31:48 2008 +0000
+++ b/libfaad2/decoder.c	Sat Jan 26 18:42:17 2008 +0000
@@ -106,6 +106,7 @@
     hDecoder->config.downMatrix = 0;
     hDecoder->adts_header_present = 0;
     hDecoder->adif_header_present = 0;
+    hDecoder->latm_header_present = 0;
 #ifdef ERROR_RESILIENCE
     hDecoder->aacSectionDataResilienceFlag = 0;
     hDecoder->aacScalefactorDataResilienceFlag = 0;
@@ -320,7 +321,7 @@
 
     /* decode the audio specific config */
     rc = AudioSpecificConfig2(pBuffer, SizeOfDecoderSpecificInfo, &mp4ASC,
-        &(hDecoder->pce));
+        &(hDecoder->pce), hDecoder->latm_header_present);
 
     /* copy the relevant info to the decoder handle */
     *samplerate = mp4ASC.samplingFrequency;