diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-04 12:15:12 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-04 12:15:12 +0000 |
| commit | 1537b7e64c34bfdfa3274e35ab836e70aef38fe5 (patch) | |
| tree | d07ca46f06cf72fe50f06aa0a54712e8ddea01c4 /libmpcodecs | |
| parent | 780137b953025b2ba7295877389707290795ce39 (diff) | |
| download | mpv-1537b7e64c34bfdfa3274e35ab836e70aef38fe5.tar.bz2 mpv-1537b7e64c34bfdfa3274e35ab836e70aef38fe5.tar.xz | |
Fix 100l bugs that break playback on 64 bit systems (like typedefing __u32
as long!!).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16654 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/native/RTjpegN.c | 20 | ||||
| -rw-r--r-- | libmpcodecs/native/RTjpegN.h | 21 |
2 files changed, 20 insertions, 21 deletions
diff --git a/libmpcodecs/native/RTjpegN.c b/libmpcodecs/native/RTjpegN.c index 523612d1f9..1e5cd4042e 100644 --- a/libmpcodecs/native/RTjpegN.c +++ b/libmpcodecs/native/RTjpegN.c @@ -3221,11 +3221,11 @@ int RTjpeg_mcompressYUV420(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask #ifdef MMX emms(); - RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask); - RTjpeg_cmask=(mmx_t)(((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask); + RTjpeg_lmask.uq=((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask; + RTjpeg_cmask.uq=((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask; #else - RTjpeg_lmask=lmask; - RTjpeg_cmask=cmask; + RTjpeg_lmask.uq=lmask; + RTjpeg_cmask.uq=cmask; #endif sb=sp; @@ -3312,11 +3312,11 @@ int RTjpeg_mcompressYUV422(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask #ifdef MMX emms(); - RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask); - RTjpeg_cmask=(mmx_t)(((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask); + RTjpeg_lmask.uq=((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask; + RTjpeg_cmask.uq=((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask; #else - RTjpeg_lmask=lmask; - RTjpeg_cmask=cmask; + RTjpeg_lmask.uq=lmask; + RTjpeg_cmask.uq=cmask; #endif bp = bp - RTjpeg_width*0; @@ -3386,9 +3386,9 @@ int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask) #ifdef MMX emms(); - RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask); + RTjpeg_lmask.uq=((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask; #else - RTjpeg_lmask=lmask; + RTjpeg_lmask.uq=lmask; #endif diff --git a/libmpcodecs/native/RTjpegN.h b/libmpcodecs/native/RTjpegN.h index 1de1322c36..ca31de4ba4 100644 --- a/libmpcodecs/native/RTjpegN.h +++ b/libmpcodecs/native/RTjpegN.h @@ -22,19 +22,18 @@ */ -#if !defined(_I386_TYPES_H) && !defined(_X86_64_TYPES_H) -typedef unsigned char __u8; -typedef unsigned short __u16; -typedef unsigned long __u32; -typedef unsigned long long __u64; -typedef signed char __s8; -typedef signed short __s16; -typedef signed long __s32; -#endif +#define __u8 uint8_t +#define __u16 uint16_t +#define __u32 uint32_t +#define __u64 uint64_t +#define __s8 int8_t +#define __s16 int16_t +#define __s32 int32_t +#define __s64 int64_t extern void RTjpeg_init_Q(__u8 Q); -extern void RTjpeg_init_compress(long unsigned int *buf, int width, int height, __u8 Q); -extern void RTjpeg_init_decompress(long unsigned int *buf, int width, int height); +extern void RTjpeg_init_compress(__u32 *buf, int width, int height, __u8 Q); +extern void RTjpeg_init_decompress(__u32 *buf, int width, int height); extern int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp); extern int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp); extern void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp); |