X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_image.h;h=c5da85dd4e165d52f0f4f10b92b7d7706bae109f;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=6684bfbba150ad556402a7f10ae2fbd125d2448d;hpb=dc09f863f97360cd5dfcb9b475074c5d61f57fcd;p=vlc

diff --git a/include/vlc_image.h b/include/vlc_image.h
index 6684bfbba1..c5da85dd4e 100644
--- a/include/vlc_image.h
+++ b/include/vlc_image.h
@@ -18,13 +18,18 @@
  *
  * 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.
  *****************************************************************************/
 
-#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" {
@@ -54,8 +59,8 @@ 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( image_handler_t *, image_HandlerCreate, ( vlc_object_t * ) LIBVLC_USED );
+#define image_HandlerCreate( a ) image_HandlerCreate( VLC_OBJECT(a) )
 VLC_EXPORT( void, image_HandlerDelete, ( image_handler_t * ) );
 
 #define image_Read( a, b, c, d ) a->pf_read( a, b, c, d )
@@ -65,6 +70,10 @@ VLC_EXPORT( void, image_HandlerDelete, ( image_handler_t * ) );
 #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 )
 
+VLC_EXPORT( vlc_fourcc_t, image_Type2Fourcc, ( const char *psz_name ) );
+VLC_EXPORT( vlc_fourcc_t, image_Ext2Fourcc, ( const char *psz_name ) );
+VLC_EXPORT( vlc_fourcc_t, image_Mime2Fourcc, ( const char *psz_mime ) );
+
 # ifdef __cplusplus
 }
 # endif