Commit b5625a39 authored by Laurent Aimar's avatar Laurent Aimar

Added a small vlc_fourcc_GetCodecFromString helper.

parent cee16ae6
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
#define VLC_CODEC_MP3 VLC_FOURCC('m','p','3',' ') #define VLC_CODEC_MP3 VLC_FOURCC('m','p','3',' ')
/** /**
* It returns the codec associatedto a fourcc within a ES category. * It returns the codec associated to a fourcc within a ES category.
* *
* If not found, it will return the given fourcc. * If not found, it will return the given fourcc.
* If found, it will allways be one of the VLC_CODEC_ defined above. * If found, it will allways be one of the VLC_CODEC_ defined above.
...@@ -322,6 +322,17 @@ ...@@ -322,6 +322,17 @@
*/ */
VLC_EXPORT( vlc_fourcc_t, vlc_fourcc_GetCodec, ( int i_cat, vlc_fourcc_t i_fourcc ) ); VLC_EXPORT( vlc_fourcc_t, vlc_fourcc_GetCodec, ( int i_cat, vlc_fourcc_t i_fourcc ) );
/**
* It returns the codec associated to a fourcc store in a zero terminated
* string.
*
* If the string is NULL or does not have exactly 4 charateres, it will
* return 0, otherwise it behaves like vlc_fourcc_GetCodec.
*
* Provided for convenience.
*/
VLC_EXPORT( vlc_fourcc_t, vlc_fourcc_GetCodecFromString, ( int i_cat, const char * ) );
/** /**
* It returns the description of the given fourcc or NULL if not found. * It returns the description of the given fourcc or NULL if not found.
* *
......
...@@ -453,6 +453,7 @@ vlc_event_send ...@@ -453,6 +453,7 @@ vlc_event_send
__vlc_execve __vlc_execve
vlc_fastmem_register vlc_fastmem_register
vlc_fourcc_GetCodec vlc_fourcc_GetCodec
vlc_fourcc_GetCodecFromString
vlc_fourcc_GetDescription vlc_fourcc_GetDescription
vlc_freeaddrinfo vlc_freeaddrinfo
vlc_gai_strerror vlc_gai_strerror
......
...@@ -1186,6 +1186,15 @@ vlc_fourcc_t vlc_fourcc_GetCodec( int i_cat, vlc_fourcc_t i_fourcc ) ...@@ -1186,6 +1186,15 @@ vlc_fourcc_t vlc_fourcc_GetCodec( int i_cat, vlc_fourcc_t i_fourcc )
return CreateFourcc( e.p_class ); return CreateFourcc( e.p_class );
} }
vlc_fourcc_t vlc_fourcc_GetCodecFromString( int i_cat, const char *psz_fourcc )
{
if( !psz_fourcc || strlen(psz_fourcc) != 4 )
return 0;
return vlc_fourcc_GetCodec( i_cat,
VLC_FOURCC( psz_fourcc[0], psz_fourcc[1],
psz_fourcc[2], psz_fourcc[3] ) );
}
/* */ /* */
const char *vlc_fourcc_GetDescription( int i_cat, vlc_fourcc_t i_fourcc ) const char *vlc_fourcc_GetDescription( int i_cat, vlc_fourcc_t i_fourcc )
{ {
......
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