Commit 84726b40 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: libmp4: add define for handlers

parent b0c9dced
...@@ -335,9 +335,9 @@ static int MP4_ReadBox_ilst( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -335,9 +335,9 @@ static int MP4_ReadBox_ilst( stream_t *p_stream, MP4_Box_t *p_box )
case 0: case 0:
msg_Warn( p_stream, "no handler for ilst atom" ); msg_Warn( p_stream, "no handler for ilst atom" );
return 0; return 0;
case VLC_FOURCC('m','d','t','a'): case HANDLER_mdta:
return MP4_ReadBoxContainerChildrenIndexed( p_stream, p_box, 0, true ); return MP4_ReadBoxContainerChildrenIndexed( p_stream, p_box, 0, true );
case VLC_FOURCC('m','d','i','r'): case HANDLER_mdir:
return MP4_ReadBoxContainerChildren( p_stream, p_box, 0 ); return MP4_ReadBoxContainerChildren( p_stream, p_box, 0 );
default: default:
msg_Warn( p_stream, "Unknown ilst handler type '%4.4s'", (char*)&p_box->i_handler ); msg_Warn( p_stream, "Unknown ilst handler type '%4.4s'", (char*)&p_box->i_handler );
...@@ -3237,8 +3237,8 @@ static int MP4_ReadBox_meta( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -3237,8 +3237,8 @@ static int MP4_ReadBox_meta( stream_t *p_stream, MP4_Box_t *p_box )
/* Mandatory */ /* Mandatory */
const MP4_Box_t *p_hdlr = MP4_BoxGet( p_box, "hdlr" ); const MP4_Box_t *p_hdlr = MP4_BoxGet( p_box, "hdlr" );
if ( !p_hdlr || !BOXDATA(p_hdlr) || if ( !p_hdlr || !BOXDATA(p_hdlr) ||
( BOXDATA(p_hdlr)->i_handler_type != VLC_FOURCC('m', 'd', 't', 'a') && ( BOXDATA(p_hdlr)->i_handler_type != HANDLER_mdta &&
BOXDATA(p_hdlr)->i_handler_type != VLC_FOURCC('m', 'd', 'i', 'r') ) || BOXDATA(p_hdlr)->i_handler_type != HANDLER_mdir ) ||
BOXDATA(p_hdlr)->i_version != 0 ) BOXDATA(p_hdlr)->i_version != 0 )
return 0; return 0;
......
...@@ -289,6 +289,9 @@ ...@@ -289,6 +289,9 @@
#define ATOM_SDLN VLC_FOURCC( 'S', 'D', 'L', 'N' ) #define ATOM_SDLN VLC_FOURCC( 'S', 'D', 'L', 'N' )
#define ATOM_vndr VLC_FOURCC( 'v', 'n', 'd', 'r' ) #define ATOM_vndr VLC_FOURCC( 'v', 'n', 'd', 'r' )
#define HANDLER_mdta VLC_FOURCC('m', 'd', 't', 'a')
#define HANDLER_mdir VLC_FOURCC('m', 'd', 'i', 'r')
/* Do you want some debug information on all read boxes ? */ /* Do you want some debug information on all read boxes ? */
#ifndef NDEBUG #ifndef NDEBUG
# define MP4_VERBOSE 1 # define MP4_VERBOSE 1
......
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