Commit a1492c7c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

ASF: parse correctly advanced_mutual_exclusion types

parent 1cb53037
...@@ -983,6 +983,15 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s, ...@@ -983,6 +983,15 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
ASF_GetGUID( &p_ae->type, &p_data[0] ); ASF_GetGUID( &p_ae->type, &p_data[0] );
ASF_SKIP( 16 ); ASF_SKIP( 16 );
#ifdef ASF_DEBUG
if( guidcmp( &p_ae->type, &asf_guid_mutex_language ) )
msg_Dbg( s, "Language exclusion" );
else if( guidcmp( &p_ae->type, &asf_guid_mutex_bitrate ) )
msg_Dbg( s, "Bitrate exclusion" );
else
msg_Warn(s, "Unknown exclusion type" );
#endif
p_ae->i_stream_number_count = ASF_READ2(); p_ae->i_stream_number_count = ASF_READ2();
p_ae->pi_stream_number = calloc( p_ae->i_stream_number_count, sizeof(int) ); p_ae->pi_stream_number = calloc( p_ae->i_stream_number_count, sizeof(int) );
......
...@@ -204,6 +204,17 @@ static const guid_t asf_no_error_correction_guid = ...@@ -204,6 +204,17 @@ static const guid_t asf_no_error_correction_guid =
static const guid_t asf_guid_audio_conceal_spread = static const guid_t asf_guid_audio_conceal_spread =
{0xBFC3CD50, 0x618F, 0x11CF, {0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20}}; {0xBFC3CD50, 0x618F, 0x11CF, {0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20}};
// Mutual exclusion
static const guid_t asf_guid_mutex_language =
{0xD6E22A00, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}};
static const guid_t asf_guid_mutex_bitrate =
{0xD6E22A01, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}};
static const guid_t asf_guid_mutex_unknown =
{0xD6E22A02, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}};
/**************************************************************************** /****************************************************************************
* GUID functions * GUID functions
****************************************************************************/ ****************************************************************************/
......
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