From b8b00d9429a2f3641d582100a924c64e6c39e1c0 Mon Sep 17 00:00:00 2001
From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Wed, 18 Mar 2009 14:03:40 +0000
Subject: Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
 (GUID is also defined, but differently, in Windows headers).

Originally committed as revision 18032 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/asf.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'libavformat/asf.c')

diff --git a/libavformat/asf.c b/libavformat/asf.c
index bca212b140..2e17554f03 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -21,94 +21,94 @@
 #include "asf.h"
 
 
-const GUID ff_asf_header = {
+const ff_asf_guid ff_asf_header = {
     0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C
 };
 
-const GUID ff_asf_file_header = {
+const ff_asf_guid ff_asf_file_header = {
     0xA1, 0xDC, 0xAB, 0x8C, 0x47, 0xA9, 0xCF, 0x11, 0x8E, 0xE4, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65
 };
 
-const GUID ff_asf_stream_header = {
+const ff_asf_guid ff_asf_stream_header = {
     0x91, 0x07, 0xDC, 0xB7, 0xB7, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65
 };
 
-const GUID ff_asf_ext_stream_header = {
+const ff_asf_guid ff_asf_ext_stream_header = {
     0xCB, 0xA5, 0xE6, 0x14, 0x72, 0xC6, 0x32, 0x43, 0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A
 };
 
-const GUID ff_asf_audio_stream = {
+const ff_asf_guid ff_asf_audio_stream = {
     0x40, 0x9E, 0x69, 0xF8, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B
 };
 
-const GUID ff_asf_audio_conceal_none = {
+const ff_asf_guid ff_asf_audio_conceal_none = {
     // 0x40, 0xa4, 0xf1, 0x49, 0x4ece, 0x11d0, 0xa3, 0xac, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6
     // New value lifted from avifile
     0x00, 0x57, 0xfb, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b
 };
 
-const GUID ff_asf_audio_conceal_spread = {
+const ff_asf_guid ff_asf_audio_conceal_spread = {
      0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20
 };
 
-const GUID ff_asf_video_stream = {
+const ff_asf_guid ff_asf_video_stream = {
     0xC0, 0xEF, 0x19, 0xBC, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B
 };
 
-const GUID ff_asf_video_conceal_none = {
+const ff_asf_guid ff_asf_video_conceal_none = {
     0x00, 0x57, 0xFB, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B
 };
 
-const GUID ff_asf_command_stream = {
+const ff_asf_guid ff_asf_command_stream = {
     0xC0, 0xCF, 0xDA, 0x59, 0xE6, 0x59, 0xD0, 0x11, 0xA3, 0xAC, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6
 };
 
-const GUID ff_asf_comment_header = {
+const ff_asf_guid ff_asf_comment_header = {
     0x33, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c
 };
 
-const GUID ff_asf_codec_comment_header = {
+const ff_asf_guid ff_asf_codec_comment_header = {
     0x40, 0x52, 0xD1, 0x86, 0x1D, 0x31, 0xD0, 0x11, 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6
 };
-const GUID ff_asf_codec_comment1_header = {
+const ff_asf_guid ff_asf_codec_comment1_header = {
     0x41, 0x52, 0xd1, 0x86, 0x1D, 0x31, 0xD0, 0x11, 0xa3, 0xa4, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6
 };
 
-const GUID ff_asf_data_header = {
+const ff_asf_guid ff_asf_data_header = {
     0x36, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c
 };
 
-const GUID ff_asf_head1_guid = {
+const ff_asf_guid ff_asf_head1_guid = {
     0xb5, 0x03, 0xbf, 0x5f, 0x2E, 0xA9, 0xCF, 0x11, 0x8e, 0xe3, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65
 };
 
-const GUID ff_asf_head2_guid = {
+const ff_asf_guid ff_asf_head2_guid = {
     0x11, 0xd2, 0xd3, 0xab, 0xBA, 0xA9, 0xCF, 0x11, 0x8e, 0xe6, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65
 };
 
-const GUID ff_asf_extended_content_header = {
+const ff_asf_guid ff_asf_extended_content_header = {
         0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50
 };
 
-const GUID ff_asf_simple_index_header = {
+const ff_asf_guid ff_asf_simple_index_header = {
         0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB
 };
 
-const GUID ff_asf_ext_stream_embed_stream_header = {
+const ff_asf_guid ff_asf_ext_stream_embed_stream_header = {
         0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43
 };
 
-const GUID ff_asf_ext_stream_audio_stream = {
+const ff_asf_guid ff_asf_ext_stream_audio_stream = {
         0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03
 };
 
-const GUID ff_asf_metadata_header = {
+const ff_asf_guid ff_asf_metadata_header = {
         0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca
 };
 
 /* I am not a number !!! This GUID is the one found on the PC used to
    generate the stream */
-const GUID ff_asf_my_guid = {
+const ff_asf_guid ff_asf_my_guid = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-- 
cgit v1.2.3