[SCM] libav/experimental: analyze end condition must match r_fps selection condition fixes fps for Channel\ 4\ News_Channel\ 4_20_10_2006_19_00_01.dvr-ms

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6cc65ab3c68d5db6245473fab13f83d6a5194f41
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Mar 30 15:05:09 2007 +0000

    analyze end condition must match r_fps selection condition
    fixes fps for Channel\ 4\ News_Channel\ 4_20_10_2006_19_00_01.dvr-ms
    
    Originally committed as revision 8557 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6ff6a79..36cb269 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1697,7 +1697,7 @@ int av_find_stream_info(AVFormatContext *ic)
             if (!has_codec_parameters(st->codec))
                 break;
             /* variable fps and no guess at the real fps */
-            if(   st->codec->time_base.den >= 101LL*st->codec->time_base.num
+            if(   (st->codec->time_base.den >= 101LL*st->codec->time_base.num || st->codec->codec_id == CODEC_ID_MPEG2VIDEO)
                && duration_count[i]<20 && st->codec->codec_type == CODEC_TYPE_VIDEO)
                 break;
             if(st->parser && st->parser->parser->split && !st->codec->extradata)

-- 
Libav/FFmpeg packaging