* src/video_output/video_output.c: do not drop late frames at the video

    output level when --no-skip-frames was specified.

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index b2465161b1f67500d571ff91809da7984d96dff8..671c90f3ce854e4dc2517c4993a67ee4176ac7bb 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -786,9 +786,12 @@ static void RunThread( vout_thread_t *p_vout)
             p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ]
                 = display_date;
 
+            /* XXX: config_GetInt is slow, but this kind of frame dropping
+             * should not happen that often. */
             if( !p_picture->b_force &&
                 p_picture != p_last_picture &&
-                display_date < current_date + p_vout->render_time )
+                display_date < current_date + p_vout->render_time &&
+                config_GetInt( p_vout, "skip-frames" ) )
             {
                 /* Picture is late: it will be destroyed and the thread
                  * will directly choose the next picture */