Commit e5f6537a authored by Joseph Tulou's avatar Joseph Tulou Committed by Antoine Cellerier

changes Ext2Fourcc into image_Ext2Fourcc and exports it for reuse within vlc

Signed-off-by: default avatarAntoine Cellerier <dionoea@videolan.org>
parent 7a7ed707
...@@ -70,6 +70,8 @@ VLC_EXPORT( void, image_HandlerDelete, ( image_handler_t * ) ); ...@@ -70,6 +70,8 @@ VLC_EXPORT( void, image_HandlerDelete, ( image_handler_t * ) );
#define image_Convert( a, b, c, d ) a->pf_convert( a, b, c, d ) #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 ) #define image_Filter( a, b, c, d ) a->pf_filter( a, b, c, d )
VLC_EXPORT( vlc_fourcc_t, image_Ext2Fourcc, ( const char *psz_name ) );
# ifdef __cplusplus # ifdef __cplusplus
} }
# endif # endif
......
...@@ -153,6 +153,7 @@ httpd_UrlNew ...@@ -153,6 +153,7 @@ httpd_UrlNew
httpd_UrlNewUnique httpd_UrlNewUnique
__image_HandlerCreate __image_HandlerCreate
image_HandlerDelete image_HandlerDelete
image_Ext2Fourcc
InitMD5 InitMD5
input_Control input_Control
input_CreateFilename input_CreateFilename
......
...@@ -70,7 +70,7 @@ static filter_t *CreateFilter( vlc_object_t *, es_format_t *, ...@@ -70,7 +70,7 @@ static filter_t *CreateFilter( vlc_object_t *, es_format_t *,
video_format_t *, const char * ); video_format_t *, const char * );
static void DeleteFilter( filter_t * ); static void DeleteFilter( filter_t * );
static vlc_fourcc_t Ext2Fourcc( const char * ); vlc_fourcc_t image_Ext2Fourcc( const char * );
/*static const char *Fourcc2Ext( vlc_fourcc_t );*/ /*static const char *Fourcc2Ext( vlc_fourcc_t );*/
/** /**
...@@ -239,7 +239,7 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url, ...@@ -239,7 +239,7 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url,
if( !p_fmt_in->i_chroma ) if( !p_fmt_in->i_chroma )
{ {
/* Try to guess format from file name */ /* Try to guess format from file name */
p_fmt_in->i_chroma = Ext2Fourcc( psz_url ); p_fmt_in->i_chroma = image_Ext2Fourcc( psz_url );
} }
p_pic = ImageRead( p_image, p_block, p_fmt_in, p_fmt_out ); p_pic = ImageRead( p_image, p_block, p_fmt_in, p_fmt_out );
...@@ -351,7 +351,7 @@ static int ImageWriteUrl( image_handler_t *p_image, picture_t *p_pic, ...@@ -351,7 +351,7 @@ static int ImageWriteUrl( image_handler_t *p_image, picture_t *p_pic,
if( !p_fmt_out->i_chroma ) if( !p_fmt_out->i_chroma )
{ {
/* Try to guess format from file name */ /* Try to guess format from file name */
p_fmt_out->i_chroma = Ext2Fourcc( psz_url ); p_fmt_out->i_chroma = image_Ext2Fourcc( psz_url );
} }
file = utf8_fopen( psz_url, "wb" ); file = utf8_fopen( psz_url, "wb" );
...@@ -533,7 +533,7 @@ static const struct ...@@ -533,7 +533,7 @@ static const struct
{ 0, NULL } { 0, NULL }
}; };
static vlc_fourcc_t Ext2Fourcc( const char *psz_name ) vlc_fourcc_t image_Ext2Fourcc( const char *psz_name )
{ {
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment