From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 20 Jul 2010 22:19:39 +0000 (+0200)
Subject: Avformat: correctly detect the fps
X-Git-Tag: 1.2.0-pre1~5733
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c1cf203b27210576125cb7f23df93804c4598b39;p=vlc

Avformat: correctly detect the fps

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 60c9941387..4ad3ccbe82 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -302,7 +302,7 @@ int OpenDemux( vlc_object_t *p_this )
             }
             psz_type = "video";
             fmt.video.i_frame_rate = cc->time_base.den;
-            fmt.video.i_frame_rate_base = cc->time_base.num;
+            fmt.video.i_frame_rate_base = cc->time_base.num * __MAX( cc->ticks_per_frame, 1 );
             break;
 
         case CODEC_TYPE_SUBTITLE: