aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-17 19:38:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-21 16:47:53 +0100
commit5c6a2d9878f12da2730e06fbcc79f35d82f906cf (patch)
treea0bf028252914dca0ed0a11027f9b354b94c5c93
parent17c54e93176b8d1b39de3d4e892df9befeb07b73 (diff)
downloadffmpeg-5c6a2d9878f12da2730e06fbcc79f35d82f906cf.tar.gz
ac3probe: Detect Sonic Foundry Soft Encode AC3 as raw AC3.
Our ac3 code chain can handle it fine. More ideal would be to write a demuxer that actually extracts what can be from the additional headers and uses it for whatever it can be used for. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 30ca700ba17b9ba46f4648afa30559ad890f0221) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/ac3dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c
index fcf99363ee..92e468da43 100644
--- a/libavformat/ac3dec.c
+++ b/libavformat/ac3dec.c
@@ -40,6 +40,8 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)
buf2 = buf;
for(frames = 0; buf2 < end; frames++) {
+ if(!memcmp(buf2, "\x1\x10\0\0\0\0\0\0", 8))
+ buf2+=16;
init_get_bits(&gbc, buf2, 54);
if(ff_ac3_parse_header(&gbc, &hdr) < 0)
break;