[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/i386 idct_mmx.c,1.6,1.7

[Loren Merritt CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/i386
In directory mail:/var2/tmp/cvs-serv23406/i386

Modified Files:
	idct_mmx.c 
Log Message:
10l (symbol mangling)


Index: idct_mmx.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/idct_mmx.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- idct_mmx.c	1 Jun 2005 01:18:41 -0000	1.6
+++ idct_mmx.c	1 Jun 2005 04:51:46 -0000	1.7
@@ -639,7 +639,7 @@
     SBUTTERFLY( a, c, d, dq ) /* a=aeim d=bfjn */\
     SBUTTERFLY( t, b, c, dq ) /* t=cgko c=dhlp */
 
-#define STORE_DIFF_4P( p, t, pw32, z, dst ) \
+#define STORE_DIFF_4P( p, t, z, dst ) \
     asm volatile(\
         "psraw      $6,     "#p" \n\t"\
         "movd       (%0),   "#t" \n\t"\
@@ -664,7 +664,7 @@
         /* mm1=s02+s13  mm2=s02-s13  mm4=d02+d13  mm0=d02-d13 */
         IDCT4_1D( %%mm2, %%mm1, %%mm0, %%mm3, %%mm4, %%mm5 )
 
-        "movq     ff_pw_32, %%mm6 \n\t"
+        "movq      %0,    %%mm6 \n\t"
         /* in: 1,4,0,2  out: 1,2,3,0 */
         TRANSPOSE4( %%mm1, %%mm4, %%mm0, %%mm2, %%mm3 )
 
@@ -677,10 +677,10 @@
         TRANSPOSE4( %%mm2, %%mm4, %%mm1, %%mm3, %%mm0 )
 
         "pxor %%mm7, %%mm7    \n\t"
-    :: );
+    :: "m"(ff_pw_32));
 
-    STORE_DIFF_4P( %%mm2, %%mm4, %%mm6, %%mm7, &dst[0*stride] );
-    STORE_DIFF_4P( %%mm3, %%mm4, %%mm6, %%mm7, &dst[1*stride] );
-    STORE_DIFF_4P( %%mm0, %%mm4, %%mm6, %%mm7, &dst[2*stride] );
-    STORE_DIFF_4P( %%mm1, %%mm4, %%mm6, %%mm7, &dst[3*stride] );
+    STORE_DIFF_4P( %%mm2, %%mm4, %%mm7, &dst[0*stride] );
+    STORE_DIFF_4P( %%mm3, %%mm4, %%mm7, &dst[1*stride] );
+    STORE_DIFF_4P( %%mm0, %%mm4, %%mm7, &dst[2*stride] );
+    STORE_DIFF_4P( %%mm1, %%mm4, %%mm7, &dst[3*stride] );
 }