direct3d11: code cleaning and typos

[vlc] / include / vlc_image.h

diff --git a/include/vlc_image.h b/include/vlc_image.h
index 918078159642cfdbc7230a8c4dd36c0ab764e901..fc8b2a971150385c98196dbdb48507283b585e71 100644 (file)
--- a/include/vlc_image.h
+++ b/include/vlc_image.h
@@ -1,30 +1,35 @@
 /*****************************************************************************
  * vlc_image.h : wrapper for image reading/writing facilities
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * 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.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_IMAGE_H
-#define _VLC_IMAGE_H 1
+#ifndef VLC_IMAGE_H
+#define VLC_IMAGE_H 1
 
-#include "vlc_video.h"
+/**
+ * \file
+ * This file defines functions and structures for image conversions in vlc
+ */
+
+#include <vlc_vout.h>
 
 # ifdef __cplusplus
 extern "C" {
@@ -32,14 +37,18 @@ extern "C" {
 
 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 * );
 
     /* Private properties */
     vlc_object_t *p_parent;
@@ -48,14 +57,19 @@ struct image_handler_t
     filter_t  *p_filter;
 };
 
-VLC_EXPORT( image_handler_t *, __image_HandlerCreate, ( vlc_object_t * ) );
-#define image_HandlerCreate( a ) __image_HandlerCreate( VLC_OBJECT(a) )
-VLC_EXPORT( void, image_HandlerDelete, ( image_handler_t * ) );
+VLC_API image_handler_t * image_HandlerCreate( vlc_object_t * ) VLC_USED;
+#define image_HandlerCreate( a ) image_HandlerCreate( VLC_OBJECT(a) )
+VLC_API void image_HandlerDelete( image_handler_t * );
 
 #define image_Read( a, b, c, d ) a->pf_read( a, b, c, d )
 #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 )
+
+VLC_API vlc_fourcc_t image_Type2Fourcc( const char *psz_name );
+VLC_API vlc_fourcc_t image_Ext2Fourcc( const char *psz_name );
+VLC_API vlc_fourcc_t image_Mime2Fourcc( const char *psz_mime );
 
 # ifdef __cplusplus
 }