diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-12 20:40:13 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-12 20:40:13 +0000 |
| commit | facd2c58a653d8118d8c357360670d584a7a2dbf (patch) | |
| tree | 9dfc70125424696d580fb05c77e70e9890ec6ba5 /libmpcodecs | |
| parent | 846db09188f8d884e1eaa63cee85594281efe938 (diff) | |
| download | mpv-facd2c58a653d8118d8c357360670d584a7a2dbf.tar.bz2 mpv-facd2c58a653d8118d8c357360670d584a7a2dbf.tar.xz | |
Use proper inttypes.h types instead of broken uint32 etc. defines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25031 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_2xsai.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/libmpcodecs/vf_2xsai.c b/libmpcodecs/vf_2xsai.c index 8dbf185e2c..cc7cf4a790 100644 --- a/libmpcodecs/vf_2xsai.c +++ b/libmpcodecs/vf_2xsai.c @@ -12,18 +12,14 @@ //===========================================================================// -#define uint32 unsigned long -#define uint16 unsigned short -#define uint8 unsigned char - /* FIXME: these all belong in the context, not as globals! */ -static uint32 colorMask = 0xF7DEF7DE; -static uint32 lowPixelMask = 0x08210821; -static uint32 qcolorMask = 0xE79CE79C; -static uint32 qlowpixelMask = 0x18631863; -static uint32 redblueMask = 0xF81F; -static uint32 greenMask = 0x7E0; +static uint32_t colorMask = 0xF7DEF7DE; +static uint32_t lowPixelMask = 0x08210821; +static uint32_t qcolorMask = 0xE79CE79C; +static uint32_t qlowpixelMask = 0x18631863; +static uint32_t redblueMask = 0xF81F; +static uint32_t greenMask = 0x7E0; static int PixelsPerMask = 2; static int xsai_depth = 0; @@ -87,9 +83,9 @@ int Init_2xSaI(int d) static unsigned char *src_line[4]; static unsigned char *dst_line[2]; -void Super2xSaI_ex(uint8 *src, uint32 src_pitch, - uint8 *dst, uint32 dst_pitch, - uint32 width, uint32 height, int sbpp) { +void Super2xSaI_ex(uint8_t *src, uint32_t src_pitch, + uint8_t *dst, uint32_t dst_pitch, + uint32_t width, uint32_t height, int sbpp) { unsigned int x, y; unsigned long color[16]; |