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

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jul 21 18:21:47 2010 +0200| [675c29fae820cf1753892b8884810d519c29d794] | committer: Jean-Baptiste Kempf 

Avformat: correctly detect the fps

Manual backport of c1cf203b27210576125cb7f23df93804c4598b39

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

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

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index a3028a5..6d123d0 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -286,7 +286,11 @@ int OpenDemux( vlc_object_t *p_this )
             }
             psz_type = "video";
             fmt.video.i_frame_rate = cc->time_base.den;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,20,0)
+            fmt.video.i_frame_rate_base = cc->time_base.num * __MAX( cc->ticks_per_frame, 1 );
+#else
             fmt.video.i_frame_rate_base = cc->time_base.num;
+#endif
             break;
 
         case CODEC_TYPE_SUBTITLE: