mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
Use av_probe_input_format2 and avoid accepting detection
while the score is still low. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31110 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
aca523bf78
commit
dd8db7f620
@ -135,6 +135,7 @@ static int lavf_check_file(demuxer_t *demuxer){
|
||||
lavf_priv_t *priv;
|
||||
int probe_data_size = 0;
|
||||
int read_size = INITIAL_PROBE_SIZE;
|
||||
int score;
|
||||
|
||||
if(!demuxer->priv)
|
||||
demuxer->priv=calloc(sizeof(lavf_priv_t),1);
|
||||
@ -170,11 +171,13 @@ static int lavf_check_file(demuxer_t *demuxer){
|
||||
avpd.filename += 9;
|
||||
avpd.buf_size= probe_data_size;
|
||||
|
||||
priv->avif= av_probe_input_format(&avpd, probe_data_size > 0);
|
||||
score = 0;
|
||||
priv->avif= av_probe_input_format2(&avpd, probe_data_size > 0, &score);
|
||||
read_size = FFMIN(2*read_size, PROBE_BUF_SIZE - probe_data_size);
|
||||
} while ((demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED ||
|
||||
probe_data_size < SMALL_MAX_PROBE_SIZE) &&
|
||||
!priv->avif && read_size > 0 && probe_data_size < PROBE_BUF_SIZE);
|
||||
score < AVPROBE_SCORE_MAX / 4 &&
|
||||
read_size > 0 && probe_data_size < PROBE_BUF_SIZE);
|
||||
av_free(avpd.buf);
|
||||
|
||||
if(!priv->avif){
|
||||
|
Loading…
Reference in New Issue
Block a user