[vlc-commits] vout: remove no-op (fix warning)

Rémi Denis-Courmont git at videolan.org
Wed Dec 26 20:56:13 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Dec 26 18:15:03 2018 +0200| [d22aa8b51f4a0a2e23e5b305a4338b46613da680] | committer: Rémi Denis-Courmont

vout: remove no-op (fix warning)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d22aa8b51f4a0a2e23e5b305a4338b46613da680
---

 src/video_output/display.c      | 4 ++--
 src/video_output/video_output.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 9e7c60600e..50e19a71f7 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -631,11 +631,11 @@ picture_pool_t *vout_GetPool(vout_display_t *vd, unsigned count)
     return osys->pool;
 }
 
+#if defined(_WIN32) || defined(__OS2__)
 void vout_ManageDisplay(vout_display_t *vd)
 {
     vout_display_owner_sys_t *osys = vd->owner.sys;
 
-#if defined(_WIN32) || defined(__OS2__)
     for (;;) {
         vlc_mutex_lock(&osys->lock);
         bool ch_fullscreen  = osys->ch_fullscreen;
@@ -665,8 +665,8 @@ void vout_ManageDisplay(vout_display_t *vd)
                                  wm_state))
             msg_Err(vd, "Failed to set on top");
     }
-#endif
 }
+#endif
 
 bool vout_IsDisplayFiltered(vout_display_t *vd)
 {
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index da65b266ee..d836a9a4ee 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1669,7 +1669,9 @@ static void *Thread(void *object)
         const bool picture_interlaced = sys->displayed.is_interlaced;
 
         vout_SetInterlacingState(vout, picture_interlaced);
+#if defined (_WIN32) || defined (__OS2__)
         vout_ManageDisplay(sys->display);
+#endif
     }
 
 out:



More information about the vlc-commits mailing list