]> git.sesse.net Git - ffmpeg/commitdiff
lavf: Fix fps misdetection when codec_info_duration is 0 and only a few frames are...
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Dec 2011 20:26:50 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Dec 2011 20:28:54 +0000 (21:28 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c

index 9fef5201fcbde8f86269a7c88ecbb603ec2e9fce..aeebe629a700ebc5aa1f4365b821cc55887f1cf1 100644 (file)
@@ -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;