[SCM] libav/experimental: do not base frame rate guess on just one duration

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6268538afa94eeceb61928807d1af11d4d257789
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Dec 29 21:16:21 2006 +0000

    do not base frame rate guess on just one duration
    
    Originally committed as revision 7383 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index c5bca5c..118a78f 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1959,7 +1959,7 @@ int av_find_stream_info(AVFormatContext *ic)
             if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_sample)
                 st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
 
-            if(duration_count[i]
+            if(duration_count[i]>1
                && (st->codec->time_base.num*101LL <= st->codec->time_base.den || st->codec->codec_id == CODEC_ID_MPEG2VIDEO) /*&&
                //FIXME we should not special case mpeg2, but this needs testing with non mpeg2 ...
                st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den*/){

-- 
Libav/FFmpeg packaging