1. ffmpeg
  2. Commit b8b00d9429a2f3641d582100a924c64e6c39e1c0
Browse code

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

Reimar Döffinger authored on 2009/03/18 23:03:40
Showing 4 changed files
libavformat/asf.c
History View file @ b8b00d9
... ... 
@@ -21,94 +21,94 @@
21 21 
 #include "asf.h"
22 22
23 23
24 
-const GUID ff_asf_header = {
24 
+const ff_asf_guid ff_asf_header = {
25 25 
     0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C
26 26 
 };
27 27
28 
-const GUID ff_asf_file_header = {
28 
+const ff_asf_guid ff_asf_file_header = {
29 29 
     0xA1, 0xDC, 0xAB, 0x8C, 0x47, 0xA9, 0xCF, 0x11, 0x8E, 0xE4, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65
30 30 
 };
31 31
32 
-const GUID ff_asf_stream_header = {
32 
+const ff_asf_guid ff_asf_stream_header = {
33 33 
     0x91, 0x07, 0xDC, 0xB7, 0xB7, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65
34 34 
 };
35 35
36 
-const GUID ff_asf_ext_stream_header = {
36 
+const ff_asf_guid ff_asf_ext_stream_header = {
37 37 
     0xCB, 0xA5, 0xE6, 0x14, 0x72, 0xC6, 0x32, 0x43, 0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A
38 38 
 };
39 39
40 
-const GUID ff_asf_audio_stream = {
40 
+const ff_asf_guid ff_asf_audio_stream = {
41 41 
     0x40, 0x9E, 0x69, 0xF8, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B
42 42 
 };
43 43
44 
-const GUID ff_asf_audio_conceal_none = {
44 
+const ff_asf_guid ff_asf_audio_conceal_none = {
45 45 
     // 0x40, 0xa4, 0xf1, 0x49, 0x4ece, 0x11d0, 0xa3, 0xac, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6
46 46 
     // New value lifted from avifile
47 47 
     0x00, 0x57, 0xfb, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b
48 48 
 };
49 49
50 
-const GUID ff_asf_audio_conceal_spread = {
50 
+const ff_asf_guid ff_asf_audio_conceal_spread = {
51 51 
      0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20
52 52 
 };
53 53
54 
-const GUID ff_asf_video_stream = {
54 
+const ff_asf_guid ff_asf_video_stream = {
55 55 
     0xC0, 0xEF, 0x19, 0xBC, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B
56 56 
 };
57 57
58 
-const GUID ff_asf_video_conceal_none = {
58 
+const ff_asf_guid ff_asf_video_conceal_none = {
59 59 
     0x00, 0x57, 0xFB, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B
60 60 
 };
61 61
62 
-const GUID ff_asf_command_stream = {
62 
+const ff_asf_guid ff_asf_command_stream = {
63 63 
     0xC0, 0xCF, 0xDA, 0x59, 0xE6, 0x59, 0xD0, 0x11, 0xA3, 0xAC, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6
64 64 
 };
65 65
66 
-const GUID ff_asf_comment_header = {
66 
+const ff_asf_guid ff_asf_comment_header = {
67 67 
     0x33, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c
68 68 
 };
69 69
70 
-const GUID ff_asf_codec_comment_header = {
70 
+const ff_asf_guid ff_asf_codec_comment_header = {
71 71 
     0x40, 0x52, 0xD1, 0x86, 0x1D, 0x31, 0xD0, 0x11, 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6
72 72 
 };
73 
-const GUID ff_asf_codec_comment1_header = {
73 
+const ff_asf_guid ff_asf_codec_comment1_header = {
74 74 
     0x41, 0x52, 0xd1, 0x86, 0x1D, 0x31, 0xD0, 0x11, 0xa3, 0xa4, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6
75 75 
 };
76 76
77 
-const GUID ff_asf_data_header = {
77 
+const ff_asf_guid ff_asf_data_header = {
78 78 
     0x36, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c
79 79 
 };
80 80
81 
-const GUID ff_asf_head1_guid = {
81 
+const ff_asf_guid ff_asf_head1_guid = {
82 82 
     0xb5, 0x03, 0xbf, 0x5f, 0x2E, 0xA9, 0xCF, 0x11, 0x8e, 0xe3, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65
83 83 
 };
84 84
85 
-const GUID ff_asf_head2_guid = {
85 
+const ff_asf_guid ff_asf_head2_guid = {
86 86 
     0x11, 0xd2, 0xd3, 0xab, 0xBA, 0xA9, 0xCF, 0x11, 0x8e, 0xe6, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65
87 87 
 };
88 88
89 
-const GUID ff_asf_extended_content_header = {
89 
+const ff_asf_guid ff_asf_extended_content_header = {
90 90 
         0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50
91 91 
 };
92 92
93 
-const GUID ff_asf_simple_index_header = {
93 
+const ff_asf_guid ff_asf_simple_index_header = {
94 94 
         0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB
95 95 
 };
96 96
97 
-const GUID ff_asf_ext_stream_embed_stream_header = {
97 
+const ff_asf_guid ff_asf_ext_stream_embed_stream_header = {
98 98 
         0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43
99 99 
 };
100 100
101 
-const GUID ff_asf_ext_stream_audio_stream = {
101 
+const ff_asf_guid ff_asf_ext_stream_audio_stream = {
102 102 
         0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03
103 103 
 };
104 104
105 
-const GUID ff_asf_metadata_header = {
105 
+const ff_asf_guid ff_asf_metadata_header = {
106 106 
         0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca
107 107 
 };
108 108
109 109 
 /* I am not a number !!! This GUID is the one found on the PC used to
110 110 
    generate the stream */
111 
-const GUID ff_asf_my_guid = {
111 
+const ff_asf_guid ff_asf_my_guid = {
112 112 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
113 113 
 };
114 114
libavformat/asf.h
History View file @ b8b00d9
... ... 
@@ -44,10 +44,10 @@ typedef struct {
44 44
45 45 
 } ASFStream;
46 46
47 
-typedef uint8_t GUID[16];
47 
+typedef uint8_t ff_asf_guid[16];
48 48
49 49 
 typedef struct {
50 
-    GUID guid;                  ///< generated by client computer
50 
+    ff_asf_guid guid;                  ///< generated by client computer
51 51 
     uint64_t file_size;         /**< in bytes
52 52 
                                  *   invalid if broadcasting */
53 53 
     uint64_t create_time;       /**< time of creation, in 100-nanosecond units since 1.1.1601
... ... 
@@ -135,28 +135,28 @@ typedef struct {
135 135 
     ASFStream* asf_st;                   ///< currently decoded stream
136 136 
 } ASFContext;
137 137
138 
-extern const GUID ff_asf_header;
139 
-extern const GUID ff_asf_file_header;
140 
-extern const GUID ff_asf_stream_header;
141 
-extern const GUID ff_asf_ext_stream_header;
142 
-extern const GUID ff_asf_audio_stream;
143 
-extern const GUID ff_asf_audio_conceal_none;
144 
-extern const GUID ff_asf_audio_conceal_spread;
145 
-extern const GUID ff_asf_video_stream;
146 
-extern const GUID ff_asf_video_conceal_none;
147 
-extern const GUID ff_asf_command_stream;
148 
-extern const GUID ff_asf_comment_header;
149 
-extern const GUID ff_asf_codec_comment_header;
150 
-extern const GUID ff_asf_codec_comment1_header;
151 
-extern const GUID ff_asf_data_header;
152 
-extern const GUID ff_asf_head1_guid;
153 
-extern const GUID ff_asf_head2_guid;
154 
-extern const GUID ff_asf_extended_content_header;
155 
-extern const GUID ff_asf_simple_index_header;
156 
-extern const GUID ff_asf_ext_stream_embed_stream_header;
157 
-extern const GUID ff_asf_ext_stream_audio_stream;
158 
-extern const GUID ff_asf_metadata_header;
159 
-extern const GUID ff_asf_my_guid;
138 
+extern const ff_asf_guid ff_asf_header;
139 
+extern const ff_asf_guid ff_asf_file_header;
140 
+extern const ff_asf_guid ff_asf_stream_header;
141 
+extern const ff_asf_guid ff_asf_ext_stream_header;
142 
+extern const ff_asf_guid ff_asf_audio_stream;
143 
+extern const ff_asf_guid ff_asf_audio_conceal_none;
144 
+extern const ff_asf_guid ff_asf_audio_conceal_spread;
145 
+extern const ff_asf_guid ff_asf_video_stream;
146 
+extern const ff_asf_guid ff_asf_video_conceal_none;
147 
+extern const ff_asf_guid ff_asf_command_stream;
148 
+extern const ff_asf_guid ff_asf_comment_header;
149 
+extern const ff_asf_guid ff_asf_codec_comment_header;
150 
+extern const ff_asf_guid ff_asf_codec_comment1_header;
151 
+extern const ff_asf_guid ff_asf_data_header;
152 
+extern const ff_asf_guid ff_asf_head1_guid;
153 
+extern const ff_asf_guid ff_asf_head2_guid;
154 
+extern const ff_asf_guid ff_asf_extended_content_header;
155 
+extern const ff_asf_guid ff_asf_simple_index_header;
156 
+extern const ff_asf_guid ff_asf_ext_stream_embed_stream_header;
157 
+extern const ff_asf_guid ff_asf_ext_stream_audio_stream;
158 
+extern const ff_asf_guid ff_asf_metadata_header;
159 
+extern const ff_asf_guid ff_asf_my_guid;
160 160
161 161 
 extern const AVMetadataConv ff_asf_metadata_conv[];
162 162
libavformat/asfdec.c
History View file @ b8b00d9
... ... 
@@ -34,11 +34,11 @@ void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format);
34 34 
 #define FRAME_HEADER_SIZE 17
35 35 
 // Fix Me! FRAME_HEADER_SIZE may be different.
36 36
37 
-static const GUID index_guid = {
37 
+static const ff_asf_guid index_guid = {
38 38 
     0x90, 0x08, 0x00, 0x33, 0xb1, 0xe5, 0xcf, 0x11, 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb
39 39 
 };
40 40
41 
-static const GUID stream_bitrate_guid = { /* (http://get.to/sdp) */
41 
+static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */
42 42 
     0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2
43 43 
 };
44 44 
 /**********************************/
... ... 
@@ -51,7 +51,7 @@ static const GUID stream_bitrate_guid = { /* (http://get.to/sdp) */
51 51 
 if (!guidcmp(g, &cmp)) \
52 52 
     dprintf(NULL, "(GUID: %s) ", #cmp)
53 53
54 
-static void print_guid(const GUID *g)
54 
+static void print_guid(const ff_asf_guid *g)
55 55 
 {
56 56 
     int i;
57 57 
     PRINT_IF_GUID(g, ff_asf_header);
... ... 
@@ -89,10 +89,10 @@ static void print_guid(const GUID *g)
89 89
90 90 
 static int guidcmp(const void *g1, const void *g2)
91 91 
 {
92 
-    return memcmp(g1, g2, sizeof(GUID));
92 
+    return memcmp(g1, g2, sizeof(ff_asf_guid));
93 93 
 }
94 94
95 
-static void get_guid(ByteIOContext *s, GUID *g)
95 
+static void get_guid(ByteIOContext *s, ff_asf_guid *g)
96 96 
 {
97 97 
     assert(sizeof(*g) == 16);
98 98 
     get_buffer(s, *g, sizeof(*g));
... ... 
@@ -166,7 +166,7 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len)
166 166 
 static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
167 167 
 {
168 168 
     ASFContext *asf = s->priv_data;
169 
-    GUID g;
169 
+    ff_asf_guid g;
170 170 
     ByteIOContext *pb = s->pb;
171 171 
     AVStream *st;
172 172 
     ASFStream *asf_st;
... ... 
@@ -984,7 +984,7 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos,
984 984
985 985 
 static void asf_build_simple_index(AVFormatContext *s, int stream_index)
986 986 
 {
987 
-    GUID g;
987 
+    ff_asf_guid g;
988 988 
     ASFContext *asf = s->priv_data;
989 989 
     int64_t gsize, itime;
990 990 
     int64_t pos, current_pos, index_pts;
libavformat/asfenc.c
History View file @ b8b00d9
... ... 
@@ -197,7 +197,7 @@ static const AVCodecTag codec_asf_bmp_tags[] = {
197 197
198 198 
 #define PREROLL_TIME 3100
199 199
200 
-static void put_guid(ByteIOContext *s, const GUID *g)
200 
+static void put_guid(ByteIOContext *s, const ff_asf_guid *g)
201 201 
 {
202 202 
     assert(sizeof(*g) == 16);
203 203 
     put_buffer(s, *g, sizeof(*g));
... ... 
@@ -220,7 +220,7 @@ static void put_str16_nolen(ByteIOContext *s, const char *tag)
220 220 
     }while(c);
221 221 
 }
222 222
223 
-static int64_t put_header(ByteIOContext *pb, const GUID *g)
223 
+static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g)
224 224 
 {
225 225 
     int64_t pos;
226 226