diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-04 17:54:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-04 18:04:29 +0100 |
| commit | 83ddedbbf281ae299270541529540773e273e5b0 (patch) | |
| tree | 0e0fc78aacd910bfa1114f9a741f645cf5e0eec0 | |
| parent | a3bb59b163a5d55847d116704d392d2597877bec (diff) | |
| download | ffmpeg-83ddedbbf281ae299270541529540773e273e5b0.tar.gz | |
lavf: the core rfps code needs 2 durations to estimate rfps
This fixes a regression where this count became 1 with
HPM-GC\ EXPORT\ FCP-1A-AVCI100-1080i25-001.mxf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index b7506dea98..ee7de674f3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2884,7 +2884,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) // ipmovie.c produces. if (tb_unreliable(st->codec) && st->info->duration_count > 15 && st->info->duration_gcd > FFMAX(1, st->time_base.den/(500LL*st->time_base.num)) && !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 * st->info->duration_gcd, INT_MAX); - if (st->info->duration_count && !st->r_frame_rate.num + if (st->info->duration_count>1 && !st->r_frame_rate.num && tb_unreliable(st->codec)) { int num = 0; double best_error= 0.01; |