summaryrefslogtreecommitdiffstats
path: root/libfaad2/decoder.c
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-23 18:44:06 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:11:42 +0200
commitf455b6e91bc1847e5fd3ffe73ee6081e934e4e87 (patch)
tree00e18bdf19496da9bb9048fadb37738956d63cf3 /libfaad2/decoder.c
parentc795508d5fb62bb7e4e7cf29d9422876344fd781 (diff)
downloadmpv-f455b6e91bc1847e5fd3ffe73ee6081e934e4e87.tar.bz2
mpv-f455b6e91bc1847e5fd3ffe73ee6081e934e4e87.tar.xz
ad_faad: Improve LATM recognition
Patch by Dan Oscarsson, Dan d Oscarsson a tieto d com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31543 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/decoder.c')
-rw-r--r--libfaad2/decoder.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libfaad2/decoder.c b/libfaad2/decoder.c
index 3b33e11b32..710a3cf796 100644
--- a/libfaad2/decoder.c
+++ b/libfaad2/decoder.c
@@ -222,7 +222,7 @@ static int latmCheck(latm_header *latm, bitfile *ld)
int32_t NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder, uint8_t *buffer,
uint32_t buffer_size,
- uint32_t *samplerate, uint8_t *channels)
+ uint32_t *samplerate, uint8_t *channels, int latm_stream)
{
uint32_t bits = 0;
bitfile ld;
@@ -257,6 +257,9 @@ int32_t NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder, uint8_t *buffer,
hDecoder->latm_header_present = 0;
return x;
}
+ else if (latm_stream) {
+ return -1;
+ }
else
/* Check if an ADIF header is present */
if ((buffer[0] == 'A') && (buffer[1] == 'D') &&