[vlc-commits] splitter: make p_owner a void pointer

[Rémi Denis-Courmont]

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

splitter: make p_owner a void pointer

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

 include/vlc_video_splitter.h |  3 +--
 src/video_output/display.c   | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/vlc_video_splitter.h b/include/vlc_video_splitter.h
index 8707654a3f..1a64580194 100644
--- a/include/vlc_video_splitter.h
+++ b/include/vlc_video_splitter.h
@@ -35,7 +35,6 @@
  */
 
 typedef struct video_splitter_t video_splitter_t;
-typedef struct video_splitter_owner_t video_splitter_owner_t;
 
 /** Structure describing a video splitter output properties
  */
@@ -102,7 +101,7 @@ struct video_splitter_t
     /* Buffer allocation */
     int  (*pf_picture_new) ( video_splitter_t *, picture_t *pp_picture[] );
     void (*pf_picture_del) ( video_splitter_t *, picture_t *pp_picture[] );
-    video_splitter_owner_t *p_owner;
+    void *p_owner;
 };
 
 /**
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 50e19a71f7..000671cb0b 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -1060,9 +1060,9 @@ struct vout_display_sys_t {
     picture_t      **picture;
     vout_display_t **display;
 };
-struct video_splitter_owner_t {
+typedef struct {
     vout_display_t *wrapper;
-};
+} video_splitter_owner_t;
 
 static void SplitterEvent(vout_display_t *vd, int event, va_list args)
 {
@@ -1133,7 +1133,8 @@ static int SplitterControl(vout_display_t *vd, int query, va_list args)
 
 static int SplitterPictureNew(video_splitter_t *splitter, picture_t *picture[])
 {
-    vout_display_sys_t *wsys = splitter->p_owner->wrapper->sys;
+    video_splitter_owner_t *owner = splitter->p_owner;
+    vout_display_sys_t *wsys = owner->wrapper->sys;
 
     for (int i = 0; i < wsys->count; i++) {
         if (vout_IsDisplayFiltered(wsys->display[i])) {
@@ -1153,7 +1154,8 @@ static int SplitterPictureNew(video_splitter_t *splitter, picture_t *picture[])
 }
 static void SplitterPictureDel(video_splitter_t *splitter, picture_t *picture[])
 {
-    vout_display_sys_t *wsys = splitter->p_owner->wrapper->sys;
+    video_splitter_owner_t *owner = splitter->p_owner;
+    vout_display_sys_t *wsys = owner->wrapper->sys;
 
     for (int i = 0; i < wsys->count; i++)
         picture_Release(picture[i]);