Removes trailing spaces. Removes tabs.

[vlc] / modules / demux / asf / libasf.h

diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h
index 0c21c3ae8d498d7e20a69846935debedaac94147..a9290dbcf4e1556ccffe2b9981828e994752f118 100644 (file)
--- a/modules/demux/asf/libasf.h
+++ b/modules/demux/asf/libasf.h
@@ -119,6 +119,12 @@ static const guid_t asf_object_stream_prioritization =
 static const guid_t asf_object_extended_content_description =
 {0xD2D0A440, 0xE307, 0x11D2, {0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50}};
 
+static const guid_t asf_object_extended_stream_header =
+{0x3afb65e2, 0x47ef, 0x40f2, { 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43}};
+
+static const guid_t asf_object_extended_stream_type_audio =
+{0x31178c9d, 0x03e1, 0x4528, { 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03}};
+
 #define ASF_OBJECT_COMMON          \
     int          i_type;           \
     guid_t       i_object_id;      \
@@ -145,8 +151,8 @@ typedef struct
 /****************************************************************************
  * High level asf object
  ****************************************************************************/
-/* This is the first header find in a asf file
- * It's the only object that have subobject */
+/* This is the first header found in an asf file
+ * It's the only object that has subobjects */
 typedef struct
 {
     ASF_OBJECT_COMMON
@@ -264,7 +270,7 @@ typedef struct
     ASF_OBJECT_COMMON
 
     char *psz_title;
-    char *psz_author;
+    char *psz_artist;
     char *psz_copyright;
     char *psz_description;
     char *psz_rating;
@@ -364,7 +370,7 @@ typedef struct
     int64_t i_average_time_per_frame;
 
     int     i_stream_name_count;
-    int     i_payload_extention_system_count;
+    int     i_payload_extension_system_count;
 
     int     *pi_stream_name_language;
     char    **ppsz_stream_name;
@@ -443,7 +449,7 @@ typedef union asf_object_u
 } asf_object_t;
 
 
-void ASF_GetGUID( guid_t *p_guid, uint8_t *p_data );
+void ASF_GetGUID( guid_t *p_guid, const uint8_t *p_data );
 int  ASF_CmpGUID( const guid_t *p_guid1, const guid_t *p_guid2 );
 
 asf_object_root_t *ASF_ReadObjectRoot( stream_t *, int b_seekable );