Use var_InheritString for --decklink-video-connection.

[vlc] / include / vlc_image.h

diff --git a/include/vlc_image.h b/include/vlc_image.h
index 264a76fc1ffcf787b2bca66475aa8d5344dcc91d..c5da85dd4e165d52f0f4f10b92b7d7706bae109f 100644 (file)
--- 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" {
@@ -32,19 +37,20 @@ 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 * );
-    picture_t * (*pf_filter) ( image_handler_t *, picture_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;
@@ -53,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 )
@@ -64,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