Added RGBA and YUVA support (it will enhance subtitle scaling).

[vlc] / modules / access / mms / asf.h

diff --git a/modules/access/mms/asf.h b/modules/access/mms/asf.h
index aedbe9037727417fe3b7fcdeb662ba95fde2f7c2..049328c9244b34f783f7d986ad69b63180a7f526 100644 (file)
--- a/modules/access/mms/asf.h
+++ b/modules/access/mms/asf.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * asf.h: MMS access plug-in
  *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: asf.h,v 1.5 2003/04/20 19:29:43 fenrir Exp $
+ * Copyright (C) 2001-2004 the VideoLAN team
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -18,27 +18,28 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /****************************************************************************
  * XXX:
  *  Definitions and data duplicated from asf demuxers but I want access
- * and demux plugins to be independant
+ * and demux plugins to be independent
  *
  ****************************************************************************/
 
+#ifndef _ASF_H_
+#define _ASF_H_ 1
+
 #define ASF_STREAM_VIDEO    0x0001
 #define ASF_STREAM_AUDIO    0x0002
 #define ASF_STREAM_UNKNOWN  0xffff
 
-typedef struct asf_stream_s
+typedef struct
 {
-    int i_id;       /* 1 -> 127 */
     int i_cat;      /* ASF_STREAM_VIDEO, ASF_STREAM_AUDIO */
     int i_bitrate;  /* -1 if unknown */
     int i_selected;
-
 } asf_stream_t;
 
 typedef struct
@@ -51,7 +52,6 @@ typedef struct
 
 } asf_header_t;
 
-
 typedef struct guid_s
 {
     uint32_t v1; /* le */
@@ -61,12 +61,11 @@ typedef struct guid_s
 } guid_t;
 
 
-void E_( GenerateGuid )     ( guid_t * );
-void E_( asf_HeaderParse )  ( asf_header_t *, uint8_t *, int );
-void E_( asf_StreamSelect ) ( asf_header_t *,
-                              int i_bitrate_max, vlc_bool_t b_all, vlc_bool_t b_audio,
-                              vlc_bool_t b_video );
-
+void  GenerateGuid      ( guid_t * );
+void  asf_HeaderParse   ( asf_header_t *, uint8_t *, int );
+void  asf_StreamSelect  ( asf_header_t *,
+                              int i_bitrate_max, bool b_all, bool b_audio,
+                              bool b_video );
 
 #define GUID_FMT "%8.8x-%4.4x-%4.4x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x"
 #define GUID_PRINT( guid )  \
@@ -132,4 +131,20 @@ static const guid_t asf_object_bitrate_mutual_exclusion_guid =
     { 0x90,0x34,0x00,0xA0,0xC9,0x03,0x49,0xBE }
 };
 
+static const guid_t asf_object_extended_stream_properties_guid =
+{
+    0x14E6A5CB,
+    0xC672,
+    0x4332,
+    { 0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A }
+};
+
+static const guid_t asf_object_header_extension_guid =
+{
+    0x5FBF03B5,
+    0xA92E,
+    0x11CF,
+    { 0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }
+};
 
+#endif