diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:29:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:31:03 +0200 |
| commit | f083b4c33883719861c3055033dd35ffce73c6e0 (patch) | |
| tree | ba495eb53dd501257ee76a988c1f0bb27f555a9a /libavformat/mpegvideodec.c | |
| parent | 77570facdb41233a6fef9d8861023b1eeffe361f (diff) | |
| parent | e0f8be6413b6a8d334d6052e610af32935c310af (diff) | |
| download | ffmpeg-f083b4c33883719861c3055033dd35ffce73c6e0.tar.gz | |
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/mpegvideodec.c')
| -rw-r--r-- | libavformat/mpegvideodec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c index 471d2f4d94..a400978d02 100644 --- a/libavformat/mpegvideodec.c +++ b/libavformat/mpegvideodec.c @@ -63,8 +63,8 @@ static int mpegvideo_probe(AVProbeData *p) } } if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !apes && !res && slice > sicle) { - if(vpes) return AVPROBE_SCORE_MAX/8; - else return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg + if(vpes) return AVPROBE_SCORE_EXTENSION / 4; + else return pic>1 ? AVPROBE_SCORE_EXTENSION + 1 : AVPROBE_SCORE_EXTENSION / 2; // +1 for .mpg } return 0; } |