summaryrefslogtreecommitdiff
path: root/libavformat/xa.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-05 12:29:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-05 12:31:03 +0200
commitf083b4c33883719861c3055033dd35ffce73c6e0 (patch)
treeba495eb53dd501257ee76a988c1f0bb27f555a9a /libavformat/xa.c
parent77570facdb41233a6fef9d8861023b1eeffe361f (diff)
parente0f8be6413b6a8d334d6052e610af32935c310af (diff)
downloadffmpeg-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/xa.c')
-rw-r--r--libavformat/xa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/xa.c b/libavformat/xa.c
index e3d36e61b5..437de3f433 100644
--- a/libavformat/xa.c
+++ b/libavformat/xa.c
@@ -59,7 +59,7 @@ static int xa_probe(AVProbeData *p)
if (!channels || channels > 8 || !srate || srate > 192000 ||
bits_per_sample < 4 || bits_per_sample > 32)
return 0;
- return AVPROBE_SCORE_MAX/2;
+ return AVPROBE_SCORE_EXTENSION;
}
static int xa_read_header(AVFormatContext *s)