X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_image.h;h=ab1031b20fdc225d912f652da261dde545670b9b;hb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;hp=0422dcbd59f37170a2040f20c663767c802ade1c;hpb=f6f06645681772446242078601d091e0caddf723;p=vlc

diff --git a/include/vlc_image.h b/include/vlc_image.h
index 0422dcbd59..ab1031b20f 100644
--- a/include/vlc_image.h
+++ b/include/vlc_image.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_image.h : wrapper for image reading/writing facilities
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -18,24 +18,38 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef _VLC_IMAGE_H
 #define _VLC_IMAGE_H 1
 
-#include "vlc_video.h"
+#include <vlc_vout.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
 
 struct image_handler_t
 {
-    picture_t * (*pf_read) ( image_handler_t *, block_t *,
-                             video_format_t *, video_format_t * );
-    picture_t * (*pf_read_url) ( image_handler_t *, const char *,
-                                 video_format_t *, video_format_t * );
-    block_t* (*pf_write) ( image_handler_t *, picture_t *,
-                           video_format_t *, video_format_t * );
-    int (*pf_write_url) ( image_handler_t *, picture_t *,
-                          video_format_t *, video_format_t *, const char * );
+    picture_t * (*pf_read)      ( image_handler_t *, block_t *,
+                                  video_format_t *, video_format_t * );
+    picture_t * (*pf_read_url)  ( image_handler_t *, const char *,
+                                  video_format_t *, video_format_t * );
+    block_t * (*pf_write)       ( image_handler_t *, picture_t *,
+                                  video_format_t *, video_format_t * );
+    int (*pf_write_url)         ( image_handler_t *, picture_t *,
+                                  video_format_t *, video_format_t *,
+                                  const char * );
+
+    picture_t * (*pf_convert)   ( image_handler_t *, picture_t *,
+                                  video_format_t *, video_format_t * );
+    picture_t * (*pf_filter)    ( image_handler_t *, picture_t *,
+                                  video_format_t *, const char * );
 
     /* Private properties */
     vlc_object_t *p_parent;
@@ -52,5 +66,11 @@ VLC_EXPORT( void, image_HandlerDelete, ( image_handler_t * ) );
 #define image_ReadUrl( a, b, c, d ) a->pf_read_url( a, b, c, d )
 #define image_Write( a, b, c, d ) a->pf_write( a, b, c, d )
 #define image_WriteUrl( a, b, c, d, e ) a->pf_write_url( a, b, c, d, e )
+#define image_Convert( a, b, c, d ) a->pf_convert( a, b, c, d )
+#define image_Filter( a, b, c, d ) a->pf_filter( a, b, c, d )
+
+# ifdef __cplusplus
+}
+# endif
 
 #endif /* _VLC_IMAGE_H */