[FFmpeg-cvslog] lavf: Fix fps misdetection when codec_info_duration is 0 and only a few frames are used to estimate fps .

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 15 21:26:50 2011 +0100| [d19ca77f42080e7b9a360aee65218724c52e08ae] | committer: Michael Niedermayer

lavf: Fix fps misdetection when codec_info_duration is 0 and only a few frames are used to estimate fps.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d19ca77f42080e7b9a360aee65218724c52e08ae
---

 libavformat/utils.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9fef520..aeebe62 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2575,6 +2575,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
 
                     if(st->info->codec_info_duration && st->info->codec_info_duration*av_q2d(st->time_base) < (1001*12.0)/get_std_framerate(j))
                         continue;
+                    if(!st->info->codec_info_duration && 1.0 < (1001*12.0)/get_std_framerate(j))
+                        continue;
                     for(k=0; k<2; k++){
                         int n= st->info->duration_count;
                         double a= st->info->duration_error[k][0][j] / n;