* src/video_output: fixed a CPU heating loop in pause mode (fixes the problem with...

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index d3fb9206951bc7c5b46359ca1ee87b7f3bfe050c..61201da03aacb45891ec9b0cdb0a801c77097d27 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -953,15 +953,18 @@ static void RunThread( vout_thread_t *p_vout)
                 p_vout->pf_display( p_vout, p_directbuffer );
             }
 
-            /* Reinitialize idle loop count */
-            i_idle_loops = 0;
-
             /* Tell the vout this was the last picture and that it does not
              * need to be forced anymore. */
             p_last_picture = p_picture;
             p_last_picture->b_force = 0;
         }
 
+        if( p_picture != NULL )
+        {
+            /* Reinitialize idle loop count */
+            i_idle_loops = 0;
+        }
+
         /*
          * Check events and manage thread
          */

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 14b70a56af579b68e2471d4f76a3df51c2ba8cbe..b7fdaf6ead277682713bf3216b5955891ecec8da 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -337,12 +337,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
 
         if( PP_OUTPUTPICTURE[0]->pf_lock )
             if( PP_OUTPUTPICTURE[0]->pf_lock( p_vout, PP_OUTPUTPICTURE[0] ) )
-            {
-                if( PP_OUTPUTPICTURE[0]->pf_unlock )
-                PP_OUTPUTPICTURE[0]->pf_unlock( p_vout, PP_OUTPUTPICTURE[0] );
-
                 return NULL;
-            }
 
         vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic );
         vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_pic, p_subpic );