RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2005-10-04 12:15:12 +00:00
parent 780137b953
commit 1537b7e64c
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libmpcodecs/native/RTjpegN.c
View File

@ -3221,11 +3221,11 @@ int RTjpeg_mcompressYUV420(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask
#ifdef MMX #ifdef MMX
emms(); 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;
RTjpeg_cmask=(mmx_t)(((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask); RTjpeg_cmask.uq=((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask;
#else #else
RTjpeg_lmask=lmask; RTjpeg_lmask.uq=lmask;
RTjpeg_cmask=cmask; RTjpeg_cmask.uq=cmask;
#endif #endif
sb=sp; sb=sp;
@ -3312,11 +3312,11 @@ int RTjpeg_mcompressYUV422(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask
#ifdef MMX #ifdef MMX
emms(); 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;
RTjpeg_cmask=(mmx_t)(((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask); RTjpeg_cmask.uq=((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask;
#else #else
RTjpeg_lmask=lmask; RTjpeg_lmask.uq=lmask;
RTjpeg_cmask=cmask; RTjpeg_cmask.uq=cmask;
#endif #endif
bp = bp - RTjpeg_width*0; bp = bp - RTjpeg_width*0;
@ -3386,9 +3386,9 @@ int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask)
#ifdef MMX #ifdef MMX
emms(); 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 #else
RTjpeg_lmask=lmask; RTjpeg_lmask.uq=lmask;
#endif #endif

21
libmpcodecs/native/RTjpegN.h
View File

@ -22,19 +22,18 @@
*/ */
#if !defined(_I386_TYPES_H) && !defined(_X86_64_TYPES_H) #define __u8 uint8_t
typedef unsigned char __u8; #define __u16 uint16_t
typedef unsigned short __u16; #define __u32 uint32_t
typedef unsigned long __u32; #define __u64 uint64_t
typedef unsigned long long __u64; #define __s8 int8_t
typedef signed char __s8; #define __s16 int16_t
typedef signed short __s16; #define __s32 int32_t
typedef signed long __s32; #define __s64 int64_t
#endif
extern void RTjpeg_init_Q(__u8 Q); 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_compress(__u32 *buf, int width, int height, __u8 Q);
extern void RTjpeg_init_decompress(long unsigned int *buf, int width, int height); extern void RTjpeg_init_decompress(__u32 *buf, int width, int height);
extern int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp); extern int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp);
extern int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp); extern int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp);
extern void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp); extern void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp);