Raise needed score for codec probing in CODEC_ID_PROBE before the last packet.

Fixes issue1871

Originally committed as revision 22831 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Michael Niedermayer 15 years ago
parent ac1c95645a
commit 0f1f4816d5
  1. 3
      libavformat/utils.c

@ -675,7 +675,8 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE); memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE);
if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){ if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){
set_codec_from_probe_data(s, st, pd, 1); //FIXME we dont reduce score to 0 for the case of running out of buffer space in bytes
set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0);
if(st->codec->codec_id != CODEC_ID_PROBE){ if(st->codec->codec_id != CODEC_ID_PROBE){
pd->buf_size=0; pd->buf_size=0;
av_freep(&pd->buf); av_freep(&pd->buf);

Loading…
Cancel
Save