X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2Fmms%2Fasf.h;h=9411accd5cf963698809568e8b5a3791b93590ed;hb=d4e25d21e6bed2f14d3164b6dfc0f104023723a1;hp=0a68d32ef74927597add7fc6a5e56f35a6b143b6;hpb=4cf2f458036f18bcbf883d650f9e1af88a0c724d;p=vlc diff --git a/modules/access/mms/asf.h b/modules/access/mms/asf.h index 0a68d32ef7..9411accd5c 100644 --- a/modules/access/mms/asf.h +++ b/modules/access/mms/asf.h @@ -1,7 +1,7 @@ /***************************************************************************** * asf.h: MMS access plug-in ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN + * Copyright (C) 2001-2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,7 +18,7 @@ * * 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. *****************************************************************************/ /**************************************************************************** @@ -28,11 +28,14 @@ * ****************************************************************************/ +#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_cat; /* ASF_STREAM_VIDEO, ASF_STREAM_AUDIO */ int i_bitrate; /* -1 if unknown */ @@ -49,7 +52,6 @@ typedef struct } asf_header_t; - typedef struct guid_s { uint32_t v1; /* le */ @@ -65,7 +67,6 @@ 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 ); - #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 ) \ (guid).v1, \ @@ -130,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