diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-26 18:42:17 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-26 18:42:17 +0000 |
| commit | 54cc9247e0ff20068a6b937332ab88020bf6fbf2 (patch) | |
| tree | a9aef053ee844c1902e4da59ac4fdb3969c055d8 /libfaad2/decoder.c | |
| parent | 46cfd2988bb1fe6cd26aced8ab8af4c7a7c5ca2a (diff) | |
| download | mpv-54cc9247e0ff20068a6b937332ab88020bf6fbf2.tar.bz2 mpv-54cc9247e0ff20068a6b937332ab88020bf6fbf2.tar.xz | |
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)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25863 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/decoder.c')
| -rw-r--r-- | libfaad2/decoder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libfaad2/decoder.c b/libfaad2/decoder.c index f7d699f785..7ff12b4982 100644 --- a/libfaad2/decoder.c +++ b/libfaad2/decoder.c @@ -106,6 +106,7 @@ NeAACDecHandle NEAACDECAPI NeAACDecOpen(void) 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 @@ int8_t NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, uint8_t *pBuffer, /* 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; |