[vlc-commits] display: make vout_display_Control private

Steve Lhomme git at videolan.org
Thu Jan 16 10:23:09 CET 2020


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jan 14 09:50:06 2020 +0100| [57d082c55cc188a94056eb4a1c8dd221448e2441] | committer: Steve Lhomme

display: make vout_display_Control private

It's only used locally in display.c.

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

 include/vlc_vout_display.h | 13 +------------
 src/video_output/display.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 1827592887..664b7706a9 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -324,7 +324,7 @@ struct vout_display_t {
      *
      * This callback is called once a picture buffer content is ready,
      * as far in advance as possible to the intended display time,
-     * but only after the previous picture was displayed. 
+     * but only after the previous picture was displayed.
      *
      * The callback should perform any preprocessing operation that will not
      * actually cause the picture to be shown, such as blending the subpicture
@@ -439,17 +439,6 @@ static inline void vout_display_Display(vout_display_t *vd, picture_t *picture)
 VLC_API
 void vout_display_SetSize(vout_display_t *vd, unsigned width, unsigned height);
 
-static inline int vout_display_Control(vout_display_t *vd, int query, ...)
-{
-    va_list ap;
-    int ret;
-
-    va_start(ap, query);
-    ret = vd->control(vd, query, ap);
-    va_end(ap);
-    return ret;
-}
-
 VLC_API void vout_display_SendEventPicturesInvalid(vout_display_t *vd);
 
 static inline void vout_display_SendEventMousePressed(vout_display_t *vd, int button)
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 890b2ceaf9..1f58167242 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -61,6 +61,17 @@ static picture_t *VideoBufferNew(filter_t *filter)
     return picture_pool_Get(pool);
 }
 
+static int vout_display_Control(vout_display_t *vd, int query, ...)
+{
+    va_list ap;
+    int ret;
+
+    va_start(ap, query);
+    ret = vd->control(vd, query, ap);
+    va_end(ap);
+    return ret;
+}
+
 /*****************************************************************************
  *
  *****************************************************************************/



More information about the vlc-commits mailing list