Merge branch 'master' of git.videolan.org:vlc

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 60c9941387c34bfd76fc21922842ab328995a983..4ad3ccbe8280c8a73b3ddc5dc04abfb40efcf976 100644 (file)
--- 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: