* modules/audio_output/directx.c: backport of directx audio changes (13374). Needs...

[vlc] / include / vlc_image.h

diff --git a/include/vlc_image.h b/include/vlc_image.h
index 0422dcbd59f37170a2040f20c663767c802ade1c..264a76fc1ffcf787b2bca66475aa8d5344dcc91d 100644 (file)
--- 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>
@@ -26,17 +26,26 @@
 
 #include "vlc_video.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 * );
+    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;
     decoder_t *p_dec;
@@ -52,5 +61,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 */