* modules/video_filter/blend.c: added an i_alpha parameter for blending

[vlc] / include / vlc_filter.h

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index e10e14524b3a1b8516d4e5f138ad6b9bfa521557..5d5829b5ac3d988c9843d7314d8ace144d8eee44 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -43,7 +43,7 @@ struct filter_t
 
     /* Module properties */
     module_t *          p_module;
-    filter_sys_t *     p_sys;
+    filter_sys_t *      p_sys;
 
     /* Input format */
     es_format_t         fmt_in;
@@ -51,11 +51,13 @@ struct filter_t
     /* Output format of filter */
     es_format_t         fmt_out;
 
+    picture_t *         ( * pf_video_filter ) ( filter_t *, picture_t * );
+    block_t *           ( * pf_audio_filter ) ( filter_t *, block_t * );
     void                ( * pf_video_blend )  ( filter_t *, picture_t *,
                                                 picture_t *, picture_t *,
-                                                int, int );
-    picture_t *         ( * pf_video_filter ) ( filter_t *, picture_t * );
+                                                int, int, int );
 
+    subpicture_t *      ( *pf_sub_filter ) ( filter_t *, mtime_t );
     subpicture_t *      ( *pf_render_string ) ( filter_t *, block_t * );
 
     /*
@@ -63,8 +65,7 @@ struct filter_t
      */
 
     /* Audio output callbacks */
-    aout_buffer_t * ( * pf_aout_buffer_new) ( filter_t *, int );
-    void            ( * pf_aout_buffer_del) ( filter_t *, aout_buffer_t * );
+    block_t *       ( * pf_audio_buffer_new) ( filter_t *, int );
 
     /* Video output callbacks */
     picture_t     * ( * pf_vout_buffer_new) ( filter_t * );
@@ -73,8 +74,8 @@ struct filter_t
     void            ( * pf_picture_unlink)  ( filter_t *, picture_t * );
 
     /* SPU output callbacks */
-    subpicture_t *  ( * pf_spu_buffer_new) ( filter_t * );
-    void            ( * pf_spu_buffer_del) ( filter_t *, subpicture_t * );
+    subpicture_t *  ( * pf_sub_buffer_new) ( filter_t * );
+    void            ( * pf_sub_buffer_del) ( filter_t *, subpicture_t * );
 
     /* Private structure for the owner of the decoder */
     filter_owner_sys_t *p_owner;