diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2006-04-24 20:58:44 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2006-04-24 20:58:44 +0000 |
| commit | 3d090251794d8f792131af4a4a601a405bc1af80 (patch) | |
| tree | a4fcba86bd381d06d1263b788c9d96a1f4d17802 /src | |
| parent | ef0ba0047acc27a4d9e438e18fcf68e26331bd59 (diff) | |
| download | xine-lib-3d090251794d8f792131af4a4a601a405bc1af80.tar.gz xine-lib-3d090251794d8f792131af4a4a601a405bc1af80.tar.bz2 | |
Fix a crash in goom. Commented out the -fomit-frame-pointer workaround.
CVS patchset: 7981
CVS date: 2006/04/24 20:58:44
Diffstat (limited to 'src')
| -rw-r--r-- | src/post/goom/Makefile.am | 3 | ||||
| -rw-r--r-- | src/post/goom/diff_against_release.patch | 2 | ||||
| -rw-r--r-- | src/post/goom/mmx.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am index bb6496342..ce70019d9 100644 --- a/src/post/goom/Makefile.am +++ b/src/post/goom/Makefile.am @@ -6,7 +6,8 @@ EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_releas ## -fomit-frame-pointer segfaults here ## Use -O2 if -Os is stripped or x86 does not build -CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-Os/-O2/g'` +#CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-Os/-O2/g'` +CFLAGS = `echo @CFLAGS@ | sed -e 's/-Os/-O2/g'` lib_LTLIBRARIES = xineplug_post_goom.la diff --git a/src/post/goom/diff_against_release.patch b/src/post/goom/diff_against_release.patch index 5bded9393..b5f84c672 100644 --- a/src/post/goom/diff_against_release.patch +++ b/src/post/goom/diff_against_release.patch @@ -414,7 +414,7 @@ diff -r -u xine-lib-1.1.0-orig/src/post/goom/mmx.c xine-lib-1.1.0/src/post/goom/ "movd %%mm0,%0 \n\t" - :"=g"(expix2[loop]) - :"r"(pos),"r"(coeffs),"r"(expix1) -+ :"=g"(expix2[loop]),"=r"(pos) ++ :"=g"(expix2[loop]),"+r"(pos) + :"r"(coeffs),"r"(expix1),"g"(sizeX) ); diff --git a/src/post/goom/mmx.c b/src/post/goom/mmx.c index 484c76092..5f887cf77 100644 --- a/src/post/goom/mmx.c +++ b/src/post/goom/mmx.c @@ -116,7 +116,7 @@ void zoom_filter_mmx (int prevX, int prevY, "packuswb %%mm7, %%mm0 \n\t" "movd %%mm0,%0 \n\t" - :"=g"(expix2[loop]),"=r"(pos) + :"=g"(expix2[loop]),"+r"(pos) :"r"(coeffs),"r"(expix1),"g"(sizeX) ); |