[vlc-commits] commit: Avformat: correctly detect the fps (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jul 21 00:19:39 2010 +0200| [c1cf203b27210576125cb7f23df93804c4598b39] | committer: Jean-Baptiste Kempf 

Avformat: correctly detect the fps

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1cf203b27210576125cb7f23df93804c4598b39
---

 modules/demux/avformat/demux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 60c9941..4ad3ccb 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: