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 | |
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')
36 files changed, 56 insertions, 54 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; } diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index c531f8a179..3db23397d0 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -79,9 +79,9 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id) if(codec_id != expected_codec_id) return 0; // keep this in sync with mp3 probe, both need to avoid // issues with MPEG-files! - if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1; - else if(max_frames>200)return AVPROBE_SCORE_MAX/2; - else if(max_frames>=4) return AVPROBE_SCORE_MAX/4; + if (first_frames>=4) return AVPROBE_SCORE_EXTENSION + 1; + else if(max_frames>200)return AVPROBE_SCORE_EXTENSION; + else if(max_frames>=4) return AVPROBE_SCORE_EXTENSION/2; else if(max_frames>=1) return 1; else return 0; } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a9ea1d8e1f..1d7ba45b32 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -337,8 +337,10 @@ typedef struct AVProbeData { int buf_size; /**< Size of buf except extra allocated bytes */ } AVProbeData; -#define AVPROBE_SCORE_MAX 100 ///< maximum score, half of that is used for file-extension-based detection #define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4) +#define AVPROBE_SCORE_EXTENSION 50 ///< score for file extension +#define AVPROBE_SCORE_MAX 100 ///< maximum score + #define AVPROBE_PADDING_SIZE 32 ///< extra allocated bytes at the end of the probe buffer /// Demuxer will use avio_open, no opened file should be provided by the caller. diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 3105d339ca..28f2d64527 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -830,7 +830,7 @@ static int avi_read_header(AVFormatContext *s) static int read_gab2_sub(AVStream *st, AVPacket *pkt) { if (pkt->data && !strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data+5) == 2) { uint8_t desc[256]; - int score = AVPROBE_SCORE_MAX / 2, ret; + int score = AVPROBE_SCORE_EXTENSION, ret; AVIStream *ast = st->priv_data; AVInputFormat *sub_demuxer; AVRational time_base; diff --git a/libavformat/avs.c b/libavformat/avs.c index ec9198b7e5..5908d838a1 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -50,7 +50,7 @@ static int avs_probe(AVProbeData * p) d = p->buf; if (d[0] == 'w' && d[1] == 'W' && d[2] == 0x10 && d[3] == 0) - return 55; + return AVPROBE_SCORE_EXTENSION+5; return 0; } diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index c035128bcf..5ca3c80b32 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -61,7 +61,7 @@ static int cavsvideo_probe(AVProbeData *p) } } if(seq && seq*9<=pic*10) - return AVPROBE_SCORE_MAX/2; + return AVPROBE_SCORE_EXTENSION; return 0; } diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index 5c05758327..cdbfc0cd08 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -60,7 +60,7 @@ static int dts_probe(AVProbeData *p) max = markers[2] > markers[max] ? 2 : max; if (markers[max] > 3 && p->buf_size / markers[max] < 32*1024 && markers[max] * 4 > sum * 3) - return AVPROBE_SCORE_MAX/2+1; + return AVPROBE_SCORE_EXTENSION + 1; return 0; } diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index d5aacfd15f..7caa7a7516 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -280,7 +280,7 @@ static int flac_probe(AVProbeData *p) { if (p->buf_size < 4 || memcmp(p->buf, "fLaC", 4)) return 0; - return AVPROBE_SCORE_MAX/2; + return AVPROBE_SCORE_EXTENSION; } AVInputFormat ff_flac_demuxer = { diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c index 1b254d613a..1474a162bf 100644 --- a/libavformat/h261dec.c +++ b/libavformat/h261dec.c @@ -56,9 +56,9 @@ static int h261_probe(AVProbeData *p) } } if(valid_psc > 2*invalid_psc + 6){ - return 50; + return AVPROBE_SCORE_EXTENSION; }else if(valid_psc > 2*invalid_psc + 2) - return 25; + return AVPROBE_SCORE_EXTENSION / 2; return 0; } diff --git a/libavformat/h263dec.c b/libavformat/h263dec.c index 667fdbdcbb..e6e0345b69 100644 --- a/libavformat/h263dec.c +++ b/libavformat/h263dec.c @@ -56,9 +56,9 @@ static int h263_probe(AVProbeData *p) } } if(valid_psc > 2*invalid_psc + 2*res_change + 3){ - return 50; + return AVPROBE_SCORE_EXTENSION; }else if(valid_psc > 2*invalid_psc) - return 25; + return AVPROBE_SCORE_EXTENSION / 2; return 0; } diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c index 9c67ab9545..5de582be66 100644 --- a/libavformat/h264dec.c +++ b/libavformat/h264dec.c @@ -63,7 +63,7 @@ static int h264_probe(AVProbeData *p) } } if(sps && pps && (idr||sli>3) && res<(sps+pps+idr)) - return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg return 0; } diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 1dcc574630..a4085a9466 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -137,7 +137,7 @@ static int idcin_probe(AVProbeData *p) return 0; /* return half certainty since this check is a bit sketchy */ - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; } static int idcin_read_header(AVFormatContext *s) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 12cf46265b..e32c951a85 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -185,7 +185,7 @@ static int img_read_probe(AVProbeData *p) else if (av_match_ext(p->filename, "raw") || av_match_ext(p->filename, "gif")) return 5; else - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; } return 0; } diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c index e72fb42f1d..c2fd4d7ab6 100644 --- a/libavformat/m4vdec.c +++ b/libavformat/m4vdec.c @@ -45,7 +45,7 @@ static int mpeg4video_probe(AVProbeData *probe_packet) } if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0) - return VOP+VO > 3 ? AVPROBE_SCORE_MAX/2 : AVPROBE_SCORE_MAX/4; + return VOP+VO > 3 ? AVPROBE_SCORE_EXTENSION : AVPROBE_SCORE_EXTENSION/2; return 0; } diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index c103dcebf4..ca877c3f5f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1060,7 +1060,7 @@ static int matroska_probe(AVProbeData *p) } // probably valid EBML header but no recognized doctype - return AVPROBE_SCORE_MAX/2; + return AVPROBE_SCORE_EXTENSION; } static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska, diff --git a/libavformat/mm.c b/libavformat/mm.c index 12a11ac69d..4315802f73 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -79,7 +79,7 @@ static int probe(AVProbeData *p) return 0; /* only return half certainty since this check is a bit sketchy */ - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; } static int read_header(AVFormatContext *s) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3e48f15e20..a28631baf0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2887,7 +2887,7 @@ static int mov_probe(AVProbeData *p) (AV_RB32(p->buf+offset) != 1 || offset + 12 > (unsigned int)p->buf_size || AV_RB64(p->buf+offset + 8) == 0)) { - score = FFMAX(score, AVPROBE_SCORE_MAX - 50); + score = FFMAX(score, AVPROBE_SCORE_EXTENSION); } else { score = AVPROBE_SCORE_MAX; } @@ -2907,7 +2907,7 @@ static int mov_probe(AVProbeData *p) case MKTAG('u','u','i','d'): case MKTAG('p','r','f','l'): /* if we only find those cause probedata is too small at least rate them */ - score = FFMAX(score, AVPROBE_SCORE_MAX - 50); + score = FFMAX(score, AVPROBE_SCORE_EXTENSION); offset = FFMAX(4, AV_RB32(p->buf+offset)) + offset; break; default: diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index d599c9c489..644ffe4b4c 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -76,11 +76,11 @@ static int mp3_read_probe(AVProbeData *p) } // keep this in sync with ac3 probe, both need to avoid // issues with MPEG-files! - if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1; - else if(max_frames>200)return AVPROBE_SCORE_MAX/2; - else if(max_frames>=4) return AVPROBE_SCORE_MAX/4; + if (first_frames>=4) return AVPROBE_SCORE_EXTENSION + 1; + else if(max_frames>200)return AVPROBE_SCORE_EXTENSION; + else if(max_frames>=4) return AVPROBE_SCORE_EXTENSION / 2; else if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC) && 2*ff_id3v2_tag_len(buf0) >= p->buf_size) - return AVPROBE_SCORE_MAX/8; + return AVPROBE_SCORE_EXTENSION / 4; else if(max_frames>=1) return 1; else return 0; //mpegps_mp3_unrecognized_format.mpg has max_frames=3 diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 73f805711d..73b7eb739c 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -92,7 +92,7 @@ static int mpc8_probe(AVProbeData *p) if (size < 2) return 0; if (bs + size - 2 >= bs_end) - return AVPROBE_SCORE_MAX / 4 - 1; //seems to be valid MPC but no header yet + return AVPROBE_SCORE_EXTENSION - 1; // seems to be valid MPC but no header yet if (header_found) { if (size < 11 || size > 28) return 0; diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 8f835ad056..5d5b09fc07 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -89,14 +89,14 @@ static int mpegps_probe(AVProbeData *p) } if(vid+audio > invalid+1) /* invalid VDR files nd short PES streams */ - score= AVPROBE_SCORE_MAX/4; + score = AVPROBE_SCORE_EXTENSION / 2; if(sys>invalid && sys*9 <= pspack*10) - return (audio > 12 || vid > 3 || pspack > 2) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg + return (audio > 12 || vid > 3 || pspack > 2) ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9) - return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg + return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */ - return (audio > 12 || vid > 3 + 2*invalid) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; + return (audio > 12 || vid > 3 + 2*invalid) ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1 //mp3_misidentified_2.mp3 has sys:0 priv1:0 pspack:0 vid:0 audio:6 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; } diff --git a/libavformat/mtv.c b/libavformat/mtv.c index 6ffbb51ff2..2b85a2068e 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -64,13 +64,13 @@ static int mtv_probe(AVProbeData *p) if(!AV_RL16(&p->buf[52]) || !AV_RL16(&p->buf[54])) { if(!!AV_RL16(&p->buf[56])) - return AVPROBE_SCORE_MAX/2; + return AVPROBE_SCORE_EXTENSION; else return 0; } if(p->buf[51] != 16) - return AVPROBE_SCORE_MAX/4; // But we are going to assume 16bpp anyway .. + return AVPROBE_SCORE_EXTENSION / 2; // But we are going to assume 16bpp anyway .. return AVPROBE_SCORE_MAX; } diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index e582f0f6cc..21300a3d6b 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -786,7 +786,7 @@ static int nsv_probe(AVProbeData *p) } /* so we'll have more luck on extension... */ if (av_match_ext(p->filename, "nsv")) - return AVPROBE_SCORE_MAX/2; + return AVPROBE_SCORE_EXTENSION; /* FIXME: add mime-type check */ return score; } diff --git a/libavformat/omadec.c b/libavformat/omadec.c index a61f94aec4..68ab66d36f 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -433,7 +433,7 @@ static int oma_read_probe(AVProbeData *p) /* This check cannot overflow as tag_len has at most 28 bits */ if (p->buf_size < tag_len + 5) /* EA3 header comes late, might be outside of the probe buffer */ - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; buf += tag_len; 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; } diff --git a/libavformat/pva.c b/libavformat/pva.c index ae42c8363d..9b7a40a068 100644 --- a/libavformat/pva.c +++ b/libavformat/pva.c @@ -49,7 +49,7 @@ static int pva_probe(AVProbeData * pd) { if (pd->buf_size >= len + 8 && pva_check(buf + len) >= 0) - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; return AVPROBE_SCORE_MAX / 4; } diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 7b35666fd4..a1f047bd0d 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2030,7 +2030,7 @@ static int sdp_probe(AVProbeData *p1) while (p < p_end && *p != '\0') { if (p + sizeof("c=IN IP") - 1 < p_end && av_strstart(p, "c=IN IP", NULL)) - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; while (p < p_end - 1 && *p != '\n') p++; if (++p >= p_end) diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index b0b582d719..d2f2b69cd7 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -77,7 +77,7 @@ static int vmd_probe(AVProbeData *p) return 0; /* only return half certainty since this check is a bit sketchy */ - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; } static int vmd_read_header(AVFormatContext *s) diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index 726a85cbe5..69843503b0 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -154,10 +154,10 @@ int ff_spdif_probe(const uint8_t *p_buf, int buf_size, enum AVCodecID *codec) if (sync_codes >= 6) /* good amount of sync codes but with unexpected offsets */ - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; /* some sync codes were found */ - return AVPROBE_SCORE_MAX / 8; + return AVPROBE_SCORE_EXTENSION / 4; } static int spdif_read_header(AVFormatContext *s) diff --git a/libavformat/takdec.c b/libavformat/takdec.c index 377c10c1ab..18c2be2065 100644 --- a/libavformat/takdec.c +++ b/libavformat/takdec.c @@ -33,7 +33,7 @@ typedef struct TAKDemuxContext { static int tak_probe(AVProbeData *p) { if (!memcmp(p->buf, "tBaK", 4)) - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; return 0; } diff --git a/libavformat/tta.c b/libavformat/tta.c index 445389ed95..e6ded521ba 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -36,7 +36,7 @@ static int tta_probe(AVProbeData *p) const uint8_t *d = p->buf; if (d[0] == 'T' && d[1] == 'T' && d[2] == 'A' && d[3] == '1') - return 80; + return AVPROBE_SCORE_EXTENSION + 30; return 0; } diff --git a/libavformat/utils.c b/libavformat/utils.c index 89a5105063..eff9373fb0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -376,10 +376,10 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score if (fmt1->read_probe) { score = fmt1->read_probe(&lpd); if(fmt1->extensions && av_match_ext(lpd.filename, fmt1->extensions)) - score = FFMAX(score, nodat ? AVPROBE_SCORE_MAX/4-1 : 1); + score = FFMAX(score, nodat ? AVPROBE_SCORE_EXTENSION / 2 - 1 : 1); } else if (fmt1->extensions) { if (av_match_ext(lpd.filename, fmt1->extensions)) { - score = 50; + score = AVPROBE_SCORE_EXTENSION; } } if (score > score_max) { @@ -389,7 +389,7 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score fmt = NULL; } if(nodat) - score_max = FFMIN(AVPROBE_SCORE_MAX/4-1, score_max); + score_max = FFMIN(AVPROBE_SCORE_EXTENSION / 2 - 1, score_max); *score_ret= score_max; return fmt; diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c index e411a257f1..7c6bcde089 100644 --- a/libavformat/vc1test.c +++ b/libavformat/vc1test.c @@ -39,7 +39,7 @@ static int vc1t_probe(AVProbeData *p) if (p->buf[3] != 0xC5 || AV_RL32(&p->buf[4]) != 4 || AV_RL32(&p->buf[20]) != 0xC) return 0; - return AVPROBE_SCORE_MAX/2; + return AVPROBE_SCORE_EXTENSION; } static int vc1t_read_header(AVFormatContext *s) diff --git a/libavformat/vqf.c b/libavformat/vqf.c index f1e6aafd98..ed588288b8 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -43,7 +43,7 @@ static int vqf_probe(AVProbeData *probe_packet) if (!memcmp(probe_packet->buf + 4, "00052200", 8)) return AVPROBE_SCORE_MAX; - return AVPROBE_SCORE_MAX/2; + return AVPROBE_SCORE_EXTENSION; } static void add_metadata(AVFormatContext *s, uint32_t tag, diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index d66611758b..f2bd3a130e 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -77,7 +77,7 @@ static int wsaud_probe(AVProbeData *p) return 0; /* return 1/2 certainty since this file check is a little sketchy */ - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_EXTENSION; } static int wsaud_read_header(AVFormatContext *s) 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) |