From b8b00d9429a2f3641d582100a924c64e6c39e1c0 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger 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/asfenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/asfenc.c') 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; -- cgit v1.2.3