Skip to content

V
vlc
Commit d83eeb5e authored by Frédéric Yhuel's avatar Frédéric Yhuel Committed by Jean-Baptiste Kempf
Browse files
Options

demux/mp4: be less picky wrt VC-1 profiles we accept 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 16c650eb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
modules/demux/mp4/libmp4.c
View file @ d83eeb5e
...@@ -1448,9 +1448,10 @@ static int MP4_ReadBox_dvc1( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -1448,9 +1448,10 @@ static int MP4_ReadBox_dvc1( stream_t *p_stream, MP4_Box_t *p_box )
p_dvc1 = p_box->data.p_dvc1; p_dvc1 = p_box->data.p_dvc1;
MP4_GET1BYTE( p_dvc1->i_profile_level ); /* profile is on 4bits, level 3bits */ MP4_GET1BYTE( p_dvc1->i_profile_level ); /* profile is on 4bits, level 3bits */
if( (p_dvc1->i_profile_level & 0xf0) >> 4 != 0x06 ) uint8_t i_profile = (p_dvc1->i_profile_level & 0xf0) >> 4;
if( i_profile != 0x06 && i_profile != 0x0c )
{ {
msg_Warn( p_stream, "unsupported VC-1 profile, please report" ); msg_Warn( p_stream, "unsupported VC-1 profile (%"PRIu8"), please report", i_profile );
MP4_READBOX_EXIT( 0 ); MP4_READBOX_EXIT( 0 );
} }
...@@ -1466,8 +1467,8 @@ static int MP4_ReadBox_dvc1( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -1466,8 +1467,8 @@ static int MP4_ReadBox_dvc1( stream_t *p_stream, MP4_Box_t *p_box )
#ifdef MP4_VERBOSE #ifdef MP4_VERBOSE
msg_Dbg( p_stream, msg_Dbg( p_stream,
"read box: \"dvc1\" profile=%i level=%i", "read box: \"dvc1\" profile=%"PRIu8" level=%i",
p_dvc1->i_profile_level & 0xf0 >> 4, p_dvc1->i_profile_level & 0x0e >> 1 ); i_profile, p_dvc1->i_profile_level & 0x0e >> 1 );
#endif #endif
MP4_READBOX_EXIT( 1 ); MP4_READBOX_EXIT( 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