Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 31069:d7c792ed942e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Continue probing even for score == AVPROBE_SCORE_MAX / 4 to match FFmpeg's behaviour.
author reimar
date Sat, 01 May 2010 15:38:37 +0000
parents ae2e8f0d4625
children b8cccda750cf
comparison
equal deleted inserted replaced
31068:ae2e8f0d4625 31069:d7c792ed942e
174 score = 0; 174 score = 0;
175 priv->avif= av_probe_input_format2(&avpd, probe_data_size > 0, &score); 175 priv->avif= av_probe_input_format2(&avpd, probe_data_size > 0, &score);
176 read_size = FFMIN(2*read_size, PROBE_BUF_SIZE - probe_data_size); 176 read_size = FFMIN(2*read_size, PROBE_BUF_SIZE - probe_data_size);
177 } while ((demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED || 177 } while ((demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED ||
178 probe_data_size < SMALL_MAX_PROBE_SIZE) && 178 probe_data_size < SMALL_MAX_PROBE_SIZE) &&
179 score < AVPROBE_SCORE_MAX / 4 && 179 score <= AVPROBE_SCORE_MAX / 4 &&
180 read_size > 0 && probe_data_size < PROBE_BUF_SIZE); 180 read_size > 0 && probe_data_size < PROBE_BUF_SIZE);
181 av_free(avpd.buf); 181 av_free(avpd.buf);
182 182
183 if(!priv->avif){ 183 if(!priv->avif){
184 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n"); 184 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");