Use decoder_GetDisplayDate.

(libmpeg2/xvmc pending)

diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index 89c15cfbe01dc2f443f352b5d627ba72ab66ef81..a45e3ac0e6bca50d14bb7944f4a92abd9e5c6e1b 100644 (file)
--- a/modules/codec/ffmpeg/video.c
+++ b/modules/codec/ffmpeg/video.c
@@ -573,7 +573,7 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
         }
 
         /* Update frame late count (except when doing preroll) */
-        if( p_sys->i_pts && p_sys->i_pts <= mdate() &&
+        if( p_sys->i_pts && decoder_GetDisplayDate(p_sys->i_pts) <= mdate() &&
             !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
         {
             p_sys->i_late_frames++;

diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index 33b88910177c7e107962a8adbf4fea911cc98013..5c513e987c1fb307c2336e7abd900b430c682728 100644 (file)
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -519,7 +519,8 @@ static aout_buffer_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
 
     if( p_sys->i_out_frames <= 0 )
     {
-        if( ( p_sys->pts = p_block->i_pts ) < mdate() )
+        p_sys->pts = p_block->i_pts;
+        if( decoder_GetDisplayDate( p_block->i_pts ) < mdate() )
         {
             block_Release( p_block );
             *pp_block = NULL;
@@ -835,7 +836,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
  
     i_pts = p_block->i_pts ? p_block->i_pts : p_block->i_dts;
 
-    if( i_pts < mdate() )
+    if( decoder_GetDisplayDate( i_pts ) < mdate() )
     {
         p_sys->i_late++;
     }