[vlc-commits] vout: inline vout_ManageWrapper()

[Rémi Denis-Courmont]

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

vout: inline vout_ManageWrapper()

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

 src/video_output/video_output.c  |  2 +-
 src/video_output/vout_internal.h |  1 -
 src/video_output/vout_wrapper.c  | 11 -----------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 61f6636585..da65b266ee 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1669,7 +1669,7 @@ static void *Thread(void *object)
         const bool picture_interlaced = sys->displayed.is_interlaced;
 
         vout_SetInterlacingState(vout, picture_interlaced);
-        vout_ManageWrapper(vout);
+        vout_ManageDisplay(sys->display);
     }
 
 out:
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 06ab765a84..bb40d63ec0 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -214,7 +214,6 @@ void vout_IntfReinit( vout_thread_t * );
 /* */
 int  vout_OpenWrapper(vout_thread_t *, const char *, vout_display_cfg_t *);
 void vout_CloseWrapper(vout_thread_t *, vout_display_cfg_t *);
-void vout_ManageWrapper(vout_thread_t *);
 
 /* */
 int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *);
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 9eee3a6c61..eb9ea2e6a0 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -157,17 +157,6 @@ void vout_CloseWrapper(vout_thread_t *vout, vout_display_cfg_t *cfg)
     vout_DeleteDisplay(sys->display, cfg);
 }
 
-/*****************************************************************************
- *
- *****************************************************************************/
-void vout_ManageWrapper(vout_thread_t *vout)
-{
-    vout_thread_sys_t *sys = vout->p;
-    vout_display_t *vd = sys->display;
-
-    vout_ManageDisplay(vd);
-}
-
 #ifdef _WIN32
 static int Forward(vlc_object_t *object, char const *var,
                    vlc_value_t oldval, vlc_value_t newval, void *data)