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/psxstr.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/psxstr.c')
-rw-r--r-- | libavformat/psxstr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 90c933ecd6..e7956c06e7 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -126,7 +126,7 @@ static int str_probe(AVProbeData *p) } /* MPEG files (like those ripped from VCDs) can also look like this; * only return half certainty */ - if(vid+aud > 3) return 50; + if(vid+aud > 3) return AVPROBE_SCORE_EXTENSION; else if(vid+aud) return 1; else return 0; } |