[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-multimedia
Subject:    Re: kdemultimedia compile error
From:       Martin Vogt <mvogt () rhrk ! uni-kl ! de>
Date:       2002-06-05 7:11:48
[Download RAW message or body]

On Tue, Jun 04, 2002 at 11:55:34PM -0700, Erik Vaughn wrote:
> > > I received the following error when compiling with
> > > gcc-3.1.
> > >
> > Are you using the _yesterday_ snapshot?
> I am using the release version for both gcc and KDE.

The attached patch should fix it.
(equal to the CVS commit, yesterday)

Martin


["a.patch" (text/plain)]

diff -ru kdemultimedia-3.0.1-orig/mpeglib/lib/util/render/dither2YUV/rgb2yuv16.cpp \
                kdemultimedia-3.0.1/mpeglib/lib/util/render/dither2YUV/rgb2yuv16.cpp
--- kdemultimedia-3.0.1-orig/mpeglib/lib/util/render/dither2YUV/rgb2yuv16.cpp	Tue Feb \
                6 16:23:56 2001
+++ kdemultimedia-3.0.1/mpeglib/lib/util/render/dither2YUV/rgb2yuv16.cpp	Tue Jun  4 \
00:40:28 2002 @@ -175,7 +175,7 @@
 	// 60%5 = TEMPV
 
 	__asm__ __volatile__ (
-		"rgb2yuv16_422:\n"
+		"1:\n"
 
 		// unpack hicolor ( pixel 1 - 4)
 		"movq      (%0),    %%mm0\n"
@@ -478,7 +478,7 @@
 		"add       $4,       %3\n"
 		
 		"sub       $8,       %4\n"
-  		"jnz       rgb2yuv16_422\n"
+  		"jnz       1b\n"
 
 		"emms\n"
 
@@ -494,7 +494,7 @@
 				  unsigned char* cb, int pixel)
 {
 	__asm__ __volatile__ (
-		"rgb2yuv16_422_fast:\n"
+		"1:\n"
 
 		// unpack hicolor ( pixel 0 - 3)
 		"movq      (%0),    %%mm0\n"
@@ -615,7 +615,7 @@
 		"add       $16,     %0\n"
 		
 		"sub       $8,      %4\n"
-		"jnz       rgb2yuv16_422_fast\n"
+		"jnz       1b\n"
 
 		"emms\n"
 
@@ -634,7 +634,7 @@
 	// 44%3 = TEMPY
 	
 	__asm__ __volatile__ (
-		"rgb2y_16:\n"
+		"1:\n"
 
 		// unpack hicolor ( pixel 1 - 4)
 		"movq      (%0),    %%mm0\n"
@@ -849,7 +849,7 @@
 		"add       $8,     %1\n"
 		
 		"sub       $8,     %2\n"
-  		"jnz       rgb2y_16\n"
+  		"jnz       1b\n"
 		"emms\n"
 
 		:
@@ -861,7 +861,7 @@
 void rgb2y16bit_mmx_row_fast(unsigned char* rgb, unsigned char* lum, int pixel)
 {
 	__asm__ __volatile__ (
-        "rgb2y32_fast:\n"
+        "1:\n"
 		
 		// unpack hicolor ( pixel 1 - 4)
 		"movq      (%0),    %%mm0\n"
@@ -899,7 +899,7 @@
 		"add       $8,      %0\n"
 		
 		"sub       $4,      %2\n"
-		"jnz       rgb2y32_fast\n"
+		"jnz       1b\n"
 		
 		"emms\n"
 		
diff -ru kdemultimedia-3.0.1-orig/mpeglib/lib/util/render/dither2YUV/rgb2yuv32.cpp \
                kdemultimedia-3.0.1/mpeglib/lib/util/render/dither2YUV/rgb2yuv32.cpp
--- kdemultimedia-3.0.1-orig/mpeglib/lib/util/render/dither2YUV/rgb2yuv32.cpp	Wed Dec \
                6 19:42:07 2000
+++ kdemultimedia-3.0.1/mpeglib/lib/util/render/dither2YUV/rgb2yuv32.cpp	Tue Jun  4 \
00:44:58 2002 @@ -173,7 +173,7 @@
 	// 24%5 = TEMPV
 
 	__asm__ __volatile__ (
-		"rgb2yuv24_444:\n"
+		"1:\n"
 
 		"movq      (%0), %%mm1\n"  // load G2R2B1G1R1B0G0R0
 		"pxor      %%mm6,   %%mm6\n"  // 0 -> mm6
@@ -356,7 +356,7 @@
 		"movq      %%mm5,   (%3)\n"    // store V
 
 		"sub       $8,       %4\n"
-  		"jnz       rgb2yuv24_444\n"
+  		"jnz       1b\n"
 		"emms\n"
 
 		:
@@ -375,7 +375,7 @@
 	// 24%5 = TEMPV
 
 	__asm__ __volatile__ (
-		"rgb2yuv24_422:\n"
+		"1:\n"
 
 		"movq      (%0), %%mm1\n"  // load G2R2B1G1R1B0G0R0
 		"pxor      %%mm6,   %%mm6\n"  // 0 -> mm6
@@ -572,7 +572,7 @@
 		"add       $4,       %3\n"
 		
 		"sub       $8,       %4\n"
-  		"jnz       rgb2yuv24_422\n"
+  		"jnz       1b\n"
 		"emms\n"
 
 		:
@@ -591,7 +591,7 @@
 	// 24%5 = TEMPV
 
 	__asm__ __volatile__ (
-		"rgb2yuv32_422:\n"
+		"1:\n"
 
 		// pack rgb
 		// was:	"movq      (%0), %%mm1\n"  // load G2R2B1G1R1B0G0R0
@@ -830,7 +830,7 @@
 		"add       $4,       %3\n"
 		
 		"sub       $8,       %4\n"
-  		"jnz       rgb2yuv32_422\n"
+  		"jnz       1b\n"
 
 		"emms\n"
 
@@ -848,7 +848,7 @@
 	// 8%3 = TEMPY
 
 	__asm__ __volatile__ (
-		"rgb2y_24:\n"
+		"1:\n"
 
 		"movq      (%0), %%mm1\n"  // load G2R2B1G1R1B0G0R0
 		"pxor      %%mm6,   %%mm6\n"  // 0 -> mm6
@@ -960,7 +960,7 @@
 		"add       $8,     %1\n"
 		
 		"sub       $8,     %2\n"
-  		"jnz       rgb2y_24\n"
+  		"jnz       1b\n"
 		"emms\n"
 
 		:
@@ -977,7 +977,7 @@
 	// 8%3 = TEMPY
 
 	__asm__ __volatile__ (
-		"rgb2y_32:\n"
+		"1:\n"
 
 		// pack rgb
 		// was:	"movq      (%0), %%mm1\n"  // load G2R2B1G1R1B0G0R0
@@ -1128,7 +1128,7 @@
 		"add       $8,     %1\n"
 		
 		"sub       $8,     %2\n"
-  		"jnz       rgb2y_32\n"
+  		"jnz       1b\n"
 		"emms\n"
 
 		:


(Submitted via bugs.kde.org)


(Complete bug history is available at http://bugs.kde.org/db/43/43475.html)


_______________________________________________
kde-multimedia mailing list
kde-multimedia@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-multimedia

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic