# HG changeset patch
# User michael
# Date 1115411210 0
# Node ID 95c9cef3c3db1640ad7e1ffa08dc4fd697b24b11
# Parent  5f07cc45fd50528f6785fb9670f69f4574a9abf2
prefer container time_base for frame duration guess

diff -r 5f07cc45fd50 -r 95c9cef3c3db utils.c
--- a/utils.c	Fri May 06 16:14:29 2005 +0000
+++ b/utils.c	Fri May 06 20:26:50 2005 +0000
@@ -632,16 +632,16 @@
     *pden = 0;
     switch(st->codec.codec_type) {
     case CODEC_TYPE_VIDEO:
-        if(st->codec.time_base.num*1000 <= st->codec.time_base.den){
+        if(st->time_base.num*1000 > st->time_base.den){
             *pnum = st->time_base.num;
             *pden = st->time_base.den;
-        }else{
+        }else if(st->codec.time_base.num*1000 > st->codec.time_base.den){
             *pnum = st->codec.time_base.num;
             *pden = st->codec.time_base.den;
-        }
-        if (pc && pc->repeat_pict) {
-            *pden *= 2;
-            *pnum = (*pnum) * (2 + pc->repeat_pict);
+            if (pc && pc->repeat_pict) {
+                *pden *= 2;
+                *pnum = (*pnum) * (2 + pc->repeat_pict);
+            }
         }
         break;
     case CODEC_TYPE_AUDIO: