From 0f1f4816d59cbc0d5144699ab356763387d2732d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 11 Apr 2010 00:43:36 +0000 Subject: [PATCH] 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 --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index eaa912612f..20316af64b 100644 --- a/libavformat/utils.c +++ b/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); 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){ pd->buf_size=0; av_freep(&pd->buf);