]> git.sesse.net Git - vlc/commitdiff
Avcodec: Fix double FPS display
authorJean-Baptiste Kempf <jb@videolan.org>
Wed, 27 Mar 2013 13:56:13 +0000 (14:56 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 27 Mar 2013 13:56:13 +0000 (14:56 +0100)
Close #5671
Patch by "rycius" on trac

modules/codec/avcodec/video.c

index 7697ef98cc1b1182706ce3afd16c2a3db4edd9f9..d8ce8a2b953c626afcf5d890d07e4d79c03ee262 100644 (file)
@@ -172,7 +172,7 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
     else if( p_context->time_base.num > 0 && p_context->time_base.den > 0 )
     {
         p_dec->fmt_out.video.i_frame_rate = p_context->time_base.den;
-        p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num;
+        p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num * __MAX( p_context->ticks_per_frame, 1 );
     }
 
     return decoder_NewPicture( p_dec );