diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-18 14:03:40 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-18 14:03:40 +0000 |
| commit | b8b00d9429a2f3641d582100a924c64e6c39e1c0 (patch) | |
| tree | b9f5799bce62f138850a34da453cfce8cf346674 /libavformat/asfenc.c | |
| parent | f650e4d34a9b45c49e287a73ed1e0b72d1cad42f (diff) | |
| download | ffmpeg-b8b00d9429a2f3641d582100a924c64e6c39e1c0.tar.gz | |
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
Diffstat (limited to 'libavformat/asfenc.c')
| -rw-r--r-- | libavformat/asfenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 8c5aec738f..39b48422a2 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -197,7 +197,7 @@ static const AVCodecTag codec_asf_bmp_tags[] = { #define PREROLL_TIME 3100 -static void put_guid(ByteIOContext *s, const GUID *g) +static void put_guid(ByteIOContext *s, const ff_asf_guid *g) { assert(sizeof(*g) == 16); put_buffer(s, *g, sizeof(*g)); @@ -220,7 +220,7 @@ static void put_str16_nolen(ByteIOContext *s, const char *tag) }while(c); } -static int64_t put_header(ByteIOContext *pb, const GUID *g) +static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g) { int64_t pos; |