summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Stembridge <jstembridge@users.sourceforge.net>2005-05-28 12:33:06 +0000
committerJames Stembridge <jstembridge@users.sourceforge.net>2005-05-28 12:33:06 +0000
commit66aa245def18af4f0e182fa6975e2810e8a772a9 (patch)
tree3f7907d629f68676d1b11e0ac056a8621215af78
parent6e52c8b7bb99ea95c8193645c7ecfb5816fbcc8c (diff)
downloadxine-lib-66aa245def18af4f0e182fa6975e2810e8a772a9.tar.gz
xine-lib-66aa245def18af4f0e182fa6975e2810e8a772a9.tar.bz2
Update our local changes
CVS patchset: 7584 CVS date: 2005/05/28 12:33:06
-rw-r--r--src/post/goom/diff_against_release.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/post/goom/diff_against_release.patch b/src/post/goom/diff_against_release.patch
index 0998eef84..c01455e41 100644
--- a/src/post/goom/diff_against_release.patch
+++ b/src/post/goom/diff_against_release.patch
@@ -43,3 +43,24 @@
YY_DECL
{
register yy_state_type yy_current_state;
+diff -u -3 -p -r1.4 -r1.5
+--- xmmx.c 2 May 2005 21:13:43 -0000 1.4
++++ xmmx.c 28 May 2005 12:20:37 -0000 1.5
+@@ -242,7 +242,7 @@ void zoom_filter_xmmx (int prevX, int pr
+ ++loop;
+ }
+ /*#ifdef HAVE_ATHLON*/
+- __asm__ __volatile__ ("femms\n");
++ __asm__ __volatile__ ("emms\n");
+ /*#else
+ emms();
+ #endif*/
+@@ -393,7 +393,7 @@ void draw_line_xmmx (Pixel *data, int x1
+ }
+ }
+ end_of_line:
+- __asm__ __volatile__ ("femms\n");
++ __asm__ __volatile__ ("emms\n");
+ }
+
+ #endif