prefer container time_base for frame duration guess

Originally committed as revision 4190 to svn://svn.ffmpeg.org/ffmpeg/trunk

prefer container time_base for frame duration guess
Originally committed as revision 4190 to svn://svn.ffmpeg.org/ffmpeg/trunk
327c4076 · Michael Niedermayer · b712fb67 · 327c4076
Commit 327c4076 authored May 06, 2005 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

utils.c libavformat/utils.c +6 -6

No files found.
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -632,16 +632,16 @@ static void compute_frame_duration(int *pnum, int *pden, AVStream *st,
    *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) {
-        if (pc && pc->repeat_pict) {
+                *pden *= 2;
-            *pden *= 2;
+                *pnum = (*pnum) * (2 + pc->repeat_pict);
-            *pnum = (*pnum) * (2 + pc->repeat_pict);
+            }
        }
        break;
    case CODEC_TYPE_AUDIO: