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.
---
This goes on top of Luca's K&R patch.
---
libavformat/aacdec.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 56f7f06..3aee82b 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -43,8 +43,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;
--
1.8.3.4 (Apple Git-47)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
