Use filter chain in video output core.

include/vlc_vout.h

@@ -31,6 +31,7 @@
 #define _VLC_VOUT_H_ 1
 
 #include <vlc_es.h>
+#include <vlc_filter.h>
 
 /** Description of a planar graphic field */
 typedef struct plane_t
@@ -365,9 +366,6 @@ VLC_EXPORT( int, __vout_AllocatePicture,( vlc_object_t *p_this, picture_t *p_pic
  * @{
  */
 
-/** Maximum numbers of video filters2 that can be attached to a vout */
-#define MAX_VFILTERS 10
-
 /**
  * Video output thread descriptor
  *
@@ -464,17 +462,9 @@ struct vout_thread_t
     char           *psz_filter_chain;
     bool            b_filter_change;
 
-    /* Video filter2 chain
-     * these are handled like in transcode.c
-     * XXX: we might need to merge the two chains (v1 and v2 filters) */
-    char       *psz_vfilters[MAX_VFILTERS];
-    config_chain_t *p_vfilters_cfg[MAX_VFILTERS];
-    int         i_vfilters_cfg;
-
-    filter_t   *pp_vfilters[MAX_VFILTERS];
-    int         i_vfilters;
-
-    bool b_vfilter_change;
+    /* Video filter2 chain */
+    filter_chain_t *p_vf2_chain;
+    char           *psz_vf2;
 
     /* Misc */
     bool            b_snapshot;     /**< take one snapshot on the next loop */