[vlc-commits] display: remove a constant return value

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Dec 26 16:43:05 2018 +0200| [29266de0f85b20531e86bd32631b383461e5a11a] | committer: Rémi Denis-Courmont

display: remove a constant return value

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

 src/video_output/display.c      | 3 +--
 src/video_output/vout_wrapper.c | 9 +--------
 src/video_output/vout_wrapper.h | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 6dd3ad21d8..e042d1a686 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -632,7 +632,7 @@ picture_pool_t *vout_GetPool(vout_display_t *vd, unsigned count)
     return osys->pool;
 }
 
-bool vout_ManageDisplay(vout_display_t *vd)
+void vout_ManageDisplay(vout_display_t *vd)
 {
     vout_display_owner_sys_t *osys = vd->owner.sys;
 
@@ -670,7 +670,6 @@ bool vout_ManageDisplay(vout_display_t *vd)
             msg_Err(vd, "Failed to set on top");
     }
 #endif
-    return false;
 }
 
 bool vout_IsDisplayFiltered(vout_display_t *vd)
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index fb9814c77e..9eee3a6c61 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -165,14 +165,7 @@ void vout_ManageWrapper(vout_thread_t *vout)
     vout_thread_sys_t *sys = vout->p;
     vout_display_t *vd = sys->display;
 
-    if (vout_ManageDisplay(vd)) {
-        assert(vd->info.has_pictures_invalid);
-
-        if (!vout_IsDisplayFiltered(vd))
-            sys->display_pool = vout_GetPool(vd, 3);
-        else
-            sys->display_pool = NULL;
-    }
+    vout_ManageDisplay(vd);
 }
 
 #ifdef _WIN32
diff --git a/src/video_output/vout_wrapper.h b/src/video_output/vout_wrapper.h
index 429408be8e..9fc42704b4 100644
--- a/src/video_output/vout_wrapper.h
+++ b/src/video_output/vout_wrapper.h
@@ -65,7 +65,7 @@ bool vout_IsDisplayFiltered(vout_display_t *);
 picture_t * vout_FilterDisplay(vout_display_t *, picture_t *);
 void vout_FilterFlush(vout_display_t *);
 
-bool vout_ManageDisplay(vout_display_t *);
+void vout_ManageDisplay(vout_display_t *);
 
 void vout_SetDisplaySize(vout_display_t *, unsigned width, unsigned height);
 void vout_SetDisplayFilled(vout_display_t *, bool is_filled);