[MPlayer-cvslog] CVS: main/libmpcodecs/native RTjpegN.c,1.10,1.11

Reimar Döffinger CVS syncmail at mplayerhq.hu
Tue Oct 4 21:44:44 CEST 2005


CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpcodecs/native
In directory mail:/var2/tmp/cvs-serv31458

Modified Files:
	RTjpegN.c 
Log Message:
Stupidity in last patch broke compile without MMX: RTjpeg_lmask is a union
only in the MMX case.


Index: RTjpegN.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/native/RTjpegN.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RTjpegN.c	4 Oct 2005 12:15:12 -0000	1.10
+++ RTjpegN.c	4 Oct 2005 19:44:42 -0000	1.11
@@ -3224,8 +3224,8 @@
  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 @@
  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 @@
  emms();
  RTjpeg_lmask.uq=((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask;
 #else
- RTjpeg_lmask.uq=lmask;
+ RTjpeg_lmask=lmask;
 #endif
 
  




More information about the MPlayer-cvslog mailing list