[FFmpeg-cvslog] lavf: estimate frame duration from r_frame_rate.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Nov 28 10:02:21 2011 +0100| [2092232581468e3d656805e2b0effd14092dc6f5] | committer: Anton Khirnov

lavf: estimate frame duration from r_frame_rate.

If r_frame_rate is set, it should be more reliable for this than either
codec or stream timebase.

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

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2b378ab..29eaf1b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -826,7 +826,10 @@ static void compute_frame_duration(int *pnum, int *pden, AVStream *st,
     *pden = 0;
     switch(st->codec->codec_type) {
     case AVMEDIA_TYPE_VIDEO:
-        if(st->time_base.num*1000LL > st->time_base.den){
+        if (st->r_frame_rate.num) {
+            *pnum = st->r_frame_rate.den;
+            *pden = st->r_frame_rate.num;
+        } else if(st->time_base.num*1000LL > st->time_base.den) {
             *pnum = st->time_base.num;
             *pden = st->time_base.den;
         }else if(st->codec->time_base.num*1000LL > st->codec->time_base.den){