diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-15 21:26:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-15 21:28:54 +0100 |
| commit | d19ca77f42080e7b9a360aee65218724c52e08ae (patch) | |
| tree | 3e6cec84fcef6bebc3cead131fa7ec1c6389ac70 | |
| parent | 5f95c130a020ec8f6eb7ade8808f59dac5834410 (diff) | |
| download | ffmpeg-d19ca77f42080e7b9a360aee65218724c52e08ae.tar.gz | |
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@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9fef5201fc..aeebe629a7 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; |