* modules/codec/ffmpeg/video.c: use frame rate info from demuxer (if available) to...

diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index 44e21e7d11a3893ffba75339ac20946655b9f7ce..e6d7b6a0a54b4f7df6427b9708c7175c95aff190 100644 (file)
--- a/modules/codec/ffmpeg/video.c
+++ b/modules/codec/ffmpeg/video.c
@@ -663,7 +663,16 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
 
             /* interpolate the next PTS */
 #if LIBAVCODEC_BUILD >= 4754
-            if( p_sys->p_context->time_base.den > 0 )
+            if( p_dec->fmt_in.video.i_frame_rate > 0 &&
+                p_dec->fmt_in.video.i_frame_rate_base > 0 )
+            {
+                p_sys->i_pts += I64C(1000000) *
+                    (2 + p_sys->p_ff_pic->repeat_pict) *
+                    p_dec->fmt_in.video.i_frame_rate_base *
+                    p_block->i_rate / INPUT_RATE_DEFAULT /
+                    (2 * p_dec->fmt_in.video.i_frame_rate);
+            }
+            else if( p_sys->p_context->time_base.den > 0 )
             {
                 p_sys->i_pts += I64C(1000000) *
                     (2 + p_sys->p_ff_pic->repeat_pict) *