Skip to content

V
vlc-2-2
Commit e8f8e328 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

ASF: rename a GUID according to spec

parent 821c7719
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/demux/asf/asf.c
View file @ e8f8e328
...@@ -249,7 +249,7 @@ static int SeekIndex( demux_t *p_demux, mtime_t i_date, float f_pos ) ...@@ -249,7 +249,7 @@ static int SeekIndex( demux_t *p_demux, mtime_t i_date, float f_pos )
if( i_date < 0 ) if( i_date < 0 )
i_date = p_sys->i_length * f_pos; i_date = p_sys->i_length * f_pos;
p_index = ASF_FindObject( p_sys->p_root, &asf_object_index_guid, 0 ); p_index = ASF_FindObject( p_sys->p_root, &asf_object_simple_index_guid, 0 );
uint64_t i_entry = i_date * 10 / p_index->i_index_entry_time_interval; uint64_t i_entry = i_date * 10 / p_index->i_index_entry_time_interval;
if( i_entry >= p_index->i_index_entry_count ) if( i_entry >= p_index->i_index_entry_count )
...@@ -765,7 +765,7 @@ static int DemuxInit( demux_t *p_demux ) ...@@ -765,7 +765,7 @@ static int DemuxInit( demux_t *p_demux )
/* check if index is available */ /* check if index is available */
asf_object_index_t *p_index = ASF_FindObject( p_sys->p_root, asf_object_index_t *p_index = ASF_FindObject( p_sys->p_root,
&asf_object_index_guid, 0 ); &asf_object_simple_index_guid, 0 );
const bool b_index = p_index && p_index->i_index_entry_count; const bool b_index = p_index && p_index->i_index_entry_count;
/* Find the extended header if any */ /* Find the extended header if any */
......
modules/demux/asf/libasf.c
View file @ e8f8e328
...@@ -1253,7 +1253,7 @@ static const struct ...@@ -1253,7 +1253,7 @@ static const struct
ASF_ReadObject_Header, ASF_FreeObject_Null }, ASF_ReadObject_Header, ASF_FreeObject_Null },
{ &asf_object_data_guid, ASF_OBJECT_DATA, { &asf_object_data_guid, ASF_OBJECT_DATA,
ASF_ReadObject_Data, ASF_FreeObject_Null }, ASF_ReadObject_Data, ASF_FreeObject_Null },
{ &asf_object_index_guid, ASF_OBJECT_INDEX, { &asf_object_simple_index_guid, ASF_OBJECT_INDEX,
ASF_ReadObject_Index, ASF_FreeObject_Index }, ASF_ReadObject_Index, ASF_FreeObject_Index },
{ &asf_object_file_properties_guid, ASF_OBJECT_FILE_PROPERTIES, { &asf_object_file_properties_guid, ASF_OBJECT_FILE_PROPERTIES,
ASF_ReadObject_file_properties, ASF_FreeObject_Null }, ASF_ReadObject_file_properties, ASF_FreeObject_Null },
...@@ -1420,7 +1420,7 @@ static const struct ...@@ -1420,7 +1420,7 @@ static const struct
{ {
{ &asf_object_header_guid, "Header" }, { &asf_object_header_guid, "Header" },
{ &asf_object_data_guid, "Data" }, { &asf_object_data_guid, "Data" },
{ &asf_object_index_guid, "Index" }, { &asf_object_simple_index_guid, "Index" },
{ &asf_object_file_properties_guid, "File Properties" }, { &asf_object_file_properties_guid, "File Properties" },
{ &asf_object_stream_properties_guid, "Stream Properties" }, { &asf_object_stream_properties_guid, "Stream Properties" },
{ &asf_object_content_description_guid, "Content Description" }, { &asf_object_content_description_guid, "Content Description" },
......
modules/demux/asf/libasf.h
View file @ e8f8e328
...@@ -64,7 +64,7 @@ static const guid_t asf_object_header_guid = ...@@ -64,7 +64,7 @@ static const guid_t asf_object_header_guid =
static const guid_t asf_object_data_guid = static const guid_t asf_object_data_guid =
{0x75B22636, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}}; {0x75B22636, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}};
static const guid_t asf_object_index_guid = static const guid_t asf_object_simple_index_guid =
{0x33000890, 0xE5B1, 0x11CF, {0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB}}; {0x33000890, 0xE5B1, 0x11CF, {0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB}};
static const guid_t asf_object_file_properties_guid = static const guid_t asf_object_file_properties_guid =
......
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