[SCM] libav/experimental: Make sure a set r_frame_rate is not overriden by a guess. Also make sure we dont waste time in this case with collecting timestamps.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0e5f33f2426dae28725b14468b61cbad052da240
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Feb 22 10:19:46 2010 +0000

    Make sure a set r_frame_rate is not overriden by a guess.
    Also make sure we dont waste time in this case with collecting timestamps.
    
    Originally committed as revision 21957 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index e01c267..103a880 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2120,7 +2120,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(   tb_unreliable(st->codec)
+            if(   tb_unreliable(st->codec) && !(st->r_frame_rate.num && st->avg_frame_rate.num)
                && duration_count[i]<20 && st->codec->codec_type == CODEC_TYPE_VIDEO)
                 break;
             if(st->parser && st->parser->parser->split && !st->codec->extradata)
@@ -2251,9 +2251,9 @@ int av_find_stream_info(AVFormatContext *ic)
             // the check for tb_unreliable() is not completely correct, since this is not about handling
             // a unreliable/inexact time base, but a time base that is finer than necessary, as e.g.
             // ipmovie.c produces.
-            if (tb_unreliable(st->codec) && duration_count[i] > 15 && duration_gcd[i] > 1)
+            if (tb_unreliable(st->codec) && duration_count[i] > 15 && duration_gcd[i] > 1 && !st->r_frame_rate.num)
                 av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, st->time_base.den, st->time_base.num * duration_gcd[i], INT_MAX);
-            if(duration_count[i]
+            if(duration_count[i] && !st->r_frame_rate.num
                && tb_unreliable(st->codec) /*&&
                //FIXME we should not special-case MPEG-2, but this needs testing with non-MPEG-2 ...
                st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den*/){

-- 
Libav/FFmpeg packaging