[vlc-commits] ASF: rename a GUID according to spec

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Aug 27 23:05:47 2011 +0200| [e8f8e3288bc2b07e69fcbe0eeb79e9c880dc0381] | committer: Jean-Baptiste Kempf

ASF: rename a GUID according to spec

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e8f8e3288bc2b07e69fcbe0eeb79e9c880dc0381
---

 modules/demux/asf/asf.c    |    4 ++--
 modules/demux/asf/libasf.c |    4 ++--
 modules/demux/asf/libasf.h |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 5821743..3f52256 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -249,7 +249,7 @@ static int SeekIndex( demux_t *p_demux, mtime_t i_date, float f_pos )
     if( i_date < 0 )
         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;
     if( i_entry >= p_index->i_index_entry_count )
@@ -765,7 +765,7 @@ static int DemuxInit( demux_t *p_demux )
 
     /* check if index is available */
     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;
 
     /* Find the extended header if any */
diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index 6a656a7..6c74bc1 100644
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -1253,7 +1253,7 @@ static const struct
       ASF_ReadObject_Header, ASF_FreeObject_Null },
     { &asf_object_data_guid, ASF_OBJECT_DATA,
       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_object_file_properties_guid, ASF_OBJECT_FILE_PROPERTIES,
       ASF_ReadObject_file_properties, ASF_FreeObject_Null },
@@ -1420,7 +1420,7 @@ static const struct
 {
     { &asf_object_header_guid, "Header" },
     { &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_stream_properties_guid, "Stream Properties" },
     { &asf_object_content_description_guid, "Content Description" },
diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h
index 0e067db..36d1e65 100644
--- a/modules/demux/asf/libasf.h
+++ b/modules/demux/asf/libasf.h
@@ -64,7 +64,7 @@ static const guid_t asf_object_header_guid =
 static const guid_t asf_object_data_guid =
 {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}};
 
 static const guid_t asf_object_file_properties_guid =