mirror of
https://github.com/mpv-player/mpv
synced 2024-11-03 03:19:24 +01:00
Stupidity in last patch broke compile without MMX: RTjpeg_lmask is a union
only in the MMX case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16662 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
0d7300028e
commit
9cae258a42
@ -3224,8 +3224,8 @@ int RTjpeg_mcompressYUV420(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 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.uq=lmask;
|
||||
RTjpeg_cmask.uq=cmask;
|
||||
RTjpeg_lmask=lmask;
|
||||
RTjpeg_cmask=cmask;
|
||||
#endif
|
||||
|
||||
sb=sp;
|
||||
@ -3315,8 +3315,8 @@ int RTjpeg_mcompressYUV422(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 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.uq=lmask;
|
||||
RTjpeg_cmask.uq=cmask;
|
||||
RTjpeg_lmask=lmask;
|
||||
RTjpeg_cmask=cmask;
|
||||
#endif
|
||||
|
||||
bp = bp - RTjpeg_width*0;
|
||||
@ -3388,7 +3388,7 @@ int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask)
|
||||
emms();
|
||||
RTjpeg_lmask.uq=((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask;
|
||||
#else
|
||||
RTjpeg_lmask.uq=lmask;
|
||||
RTjpeg_lmask=lmask;
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user