diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 14:29:56 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 14:31:03 +0400 |
commit | f083b4c33883719861c3055033dd35ffce73c6e0 (patch) | |
tree | ba495eb53dd501257ee76a988c1f0bb27f555a9a /libavformat/aacdec.c | |
parent | 77570facdb41233a6fef9d8861023b1eeffe361f (diff) | |
parent | e0f8be6413b6a8d334d6052e610af32935c310af (diff) |
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aacdec.c')
-rw-r--r-- | libavformat/aacdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 7c17dd05fa..9d7c6d711f 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -55,9 +55,9 @@ static int adts_aac_probe(AVProbeData *p) if(buf == buf0) first_frames= frames; } - if (first_frames>=3) return AVPROBE_SCORE_MAX/2+1; - else if(max_frames>500)return AVPROBE_SCORE_MAX/2; - else if(max_frames>=3) return AVPROBE_SCORE_MAX/4; + if (first_frames>=3) return AVPROBE_SCORE_EXTENSION + 1; + else if(max_frames>500)return AVPROBE_SCORE_EXTENSION; + else if(max_frames>=3) return AVPROBE_SCORE_EXTENSION / 2; else if(max_frames>=1) return 1; else return 0; } |