diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 22:38:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 22:38:05 +0100 |
| commit | 0efacc7f9a36821ab0fee42c8c12322c03263444 (patch) | |
| tree | a867e0c80c645e124547ec00f4fb70b88f294bf4 | |
| parent | 6dd007ad99f9fad84c3e50d09ded676fef48b9b0 (diff) | |
| parent | 3b1c9eb0ffb680174ffaebb47b773a4628a2be6a (diff) | |
| download | ffmpeg-0efacc7f9a36821ab0fee42c8c12322c03263444.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Lower the number of frames required to detect ADTS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/aacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index d58d6d4b4b..05cbaf78aa 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -66,7 +66,7 @@ static int adts_aac_probe(AVProbeData *p) if (first_frames >= 3) return AVPROBE_SCORE_EXTENSION + 1; - else if (max_frames > 500) + else if (max_frames > 100) return AVPROBE_SCORE_EXTENSION; else if (max_frames >= 3) return AVPROBE_SCORE_EXTENSION / 2; |