[vlc-commits] vout: remove dependency on filter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun 24 20:13:40 2015 +0300| [52f610549da8ad39a8a38e5dfb940532d03afe9b] | committer: Rémi Denis-Courmont

vout: remove dependency on filter

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

 include/vlc_vout.h               |    2 +-
 modules/access/screen/screen.c   |    1 +
 src/video_output/display.c       |    1 +
 src/video_output/vout_internal.h |    4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 8d7fb32..600cb56 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -26,8 +26,8 @@
 #ifndef VLC_VOUT_H_
 #define VLC_VOUT_H_ 1
 
+#include <vlc_es.h>
 #include <vlc_picture.h>
-#include <vlc_filter.h>
 #include <vlc_subpicture.h>
 
 /**
diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index 7b5b73f..66a1396 100644
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -33,6 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_modules.h>                 /* module_need for "video blending" */
+#include <vlc_filter.h>
 #include <vlc_url.h>
 #include "screen.h"
 
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 5662678..76287cf 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -35,6 +35,7 @@
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_modules.h>
+#include <vlc_filter.h>
 
 #include <libvlc.h>
 
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 3b01567..75320f8 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -118,8 +118,8 @@ struct vout_thread_sys_t
         vlc_mutex_t     lock;
         char            *configuration;
         video_format_t  format;
-        filter_chain_t  *chain_static;
-        filter_chain_t  *chain_interactive;
+        struct filter_chain_t *chain_static;
+        struct filter_chain_t *chain_interactive;
     } filter;
 
     /* */