diff options
| author | Martin Storsjö <martin@martin.st> | 2014-03-11 15:42:44 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-03-16 20:58:41 +0200 |
| commit | 0412cb67cda05b08dfca6bfc4ff664ea917fa932 (patch) | |
| tree | 251cdf06664ce141c464cc982bddf647028c5229 /libavformat/aacdec.c | |
| parent | a84c8af042f3b42f23cdcc51c34155647270d689 (diff) | |
| download | ffmpeg-0412cb67cda05b08dfca6bfc4ff664ea917fa932.tar.gz | |
aacdec: Don't count probed ADTS frames if there are false positives
If a portion of the probe buffer seem to resemble ADTS frames,
but some data at the end is a mismatch, disregard the whole
probing attempt. If it actually is ADTS data, there shouldn't be
any mismatches within the sequential frame data.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/aacdec.c')
| -rw-r--r-- | libavformat/aacdec.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index b9a4b4b120..f5d0c6948b 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -42,8 +42,16 @@ static int adts_aac_probe(AVProbeData *p) for (frames = 0; buf2 < end; frames++) { uint32_t header = AV_RB16(buf2); - if ((header & 0xFFF6) != 0xFFF0) + if ((header & 0xFFF6) != 0xFFF0) { + if (buf != buf0) { + // Found something that isn't an ADTS header, starting + // from a position other than the start of the buffer. + // Discard the count we've accumulated so far since it + // probably was a false positive. + frames = 0; + } break; + } fsize = (AV_RB32(buf2 + 3) >> 13) & 0x1FFF; if (fsize < 7) break; |