* intf.m: -make sure that objects like o_open, o_wizard, etc. get released in any...

[vlc] / include / vlc_filter.h

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index e99875a90e5c7f15e3c7510aeb7872243848137d..367f55a258e8ae6939b53345dcb30d1033833687 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_filter.h: filter related structures
  *****************************************************************************
- * Copyright (C) 1999-2003 VideoLAN
+ * Copyright (C) 1999-2003 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -37,6 +37,12 @@ typedef struct filter_owner_sys_t filter_owner_sys_t;
  *
  * @{
  */
+
+/*
+ * BIG FAT WARNING : the code relies in the first 4 members of filter_t
+ * and decoder_t to be the same, so if you have anything to add, do it
+ * at the end of the structure.
+ */
 struct filter_t
 {
     VLC_COMMON_MEMBERS
@@ -51,6 +57,9 @@ struct filter_t
     /* Output format of filter */
     es_format_t         fmt_out;
 
+    /* Filter configuration */
+    sout_cfg_t *        p_cfg;
+
     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 *,
@@ -58,8 +67,7 @@ struct filter_t
                                                 int, int, int );
 
     subpicture_t *      ( *pf_sub_filter ) ( filter_t *, mtime_t );
-    /* pf_render_string maps to RenderText in freetype.c */
-    subpicture_region_t *( *pf_render_string ) ( filter_t *, subpicture_t *, subpicture_region_t * );
+    int                 ( *pf_render_text ) ( filter_t *, subpicture_region_t *, subpicture_region_t * );
 
     /*
      * Buffers allocation