Mercurial > mplayer.hg
comparison codec-cfg.h @ 37190:86ba78d8137c
codec-cfg.h: Fix GUID type to be identical between 32 and 64 bit builds.
author | reimar |
---|---|
date | Sat, 27 Sep 2014 18:44:44 +0000 |
parents | 6055467828a4 |
children |
comparison
equal
deleted
inserted
replaced
37189:baa61e26cf83 | 37190:86ba78d8137c |
---|---|
48 | 48 |
49 #if !defined(GUID_TYPE) && !defined(GUID_DEFINED) | 49 #if !defined(GUID_TYPE) && !defined(GUID_DEFINED) |
50 #define GUID_TYPE 1 | 50 #define GUID_TYPE 1 |
51 #define GUID_DEFINED 1 | 51 #define GUID_DEFINED 1 |
52 typedef struct { | 52 typedef struct { |
53 unsigned long f1; | 53 unsigned int f1; |
54 unsigned short f2; | 54 unsigned short f2; |
55 unsigned short f3; | 55 unsigned short f3; |
56 unsigned char f4[8]; | 56 unsigned char f4[8]; |
57 } GUID; | 57 } GUID; |
58 #endif | 58 #endif |