[Mplayer-cvslog] CVS: main/libmpeg2 alloc.c,1.1,1.2 cpu_accel.c,1.1,1.2 idct_mlib.c,1.3,1.4 idct_mmx.c,1.4,1.5 motion_comp.c,1.5,1.6 motion_comp_mlib.c,1.3,1.4 motion_comp_mmx.c,1.3,1.4

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpeg2
In directory mail:/var/tmp.root/cvs-serv4830

Modified Files:
	alloc.c cpu_accel.c idct_mlib.c idct_mmx.c motion_comp.c 
	motion_comp_mlib.c motion_comp_mmx.c 
Log Message:
sync with libmpeg2 cvs

Index: alloc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/alloc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alloc.c	6 Apr 2003 16:41:49 -0000	1.1
+++ alloc.c	17 Jun 2003 22:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 /*
  * alloc.c
- * Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
+ * Copyright (C) 2000-2003 Michel Lespinasse <walken at zoy.org>
  * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.

Index: cpu_accel.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/cpu_accel.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpu_accel.c	6 Apr 2003 16:41:49 -0000	1.1
+++ cpu_accel.c	17 Jun 2003 22:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 /*
  * cpu_accel.c
- * Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
+ * Copyright (C) 2000-2003 Michel Lespinasse <walken at zoy.org>
  * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
@@ -126,20 +126,27 @@
 
 static inline uint32_t arch_accel (void)
 {
-    signal (SIGILL, sigill_handler);
+    static RETSIGTYPE (* oldsig) (int);
+
+    oldsig = signal (SIGILL, sigill_handler);
     if (sigsetjmp (jmpbuf, 1)) {
-	signal (SIGILL, SIG_DFL);
+	signal (SIGILL, oldsig);
 	return 0;
     }
 
     canjump = 1;
 
+#ifdef HAVE_ALTIVEC_H	/* gnu */
+#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t"
+#else			/* apple */
+#define VAND(a,b,c) "vand v" #a ",v" #b ",v" #c "\n\t"
+#endif
     asm volatile ("mtspr 256, %0\n\t"
-		  "vand %%v0, %%v0, %%v0"
+		  VAND (0, 0, 0)
 		  :
 		  : "r" (-1));
 
-    signal (SIGILL, SIG_DFL);
+    signal (SIGILL, oldsig);
     return MPEG2_ACCEL_PPC_ALTIVEC;
 }
 #endif /* ARCH_PPC */

Index: idct_mlib.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/idct_mlib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- idct_mlib.c	6 Apr 2003 16:36:02 -0000	1.3
+++ idct_mlib.c	17 Jun 2003 22:54:45 -0000	1.4
@@ -1,6 +1,6 @@
 /*
  * idct_mlib.c
- * Copyright (C) 1999-2002 Håkan Hjort <d95hjort at dtek.chalmers.se>
+ * Copyright (C) 1999-2003 Håkan Hjort <d95hjort at dtek.chalmers.se>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
  * See http://libmpeg2.sourceforge.net/ for updates.

Index: idct_mmx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/idct_mmx.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- idct_mmx.c	6 Apr 2003 16:36:02 -0000	1.4
+++ idct_mmx.c	17 Jun 2003 22:54:45 -0000	1.5
@@ -1,6 +1,6 @@
 /*
  * idct_mmx.c
- * Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
+ * Copyright (C) 2000-2003 Michel Lespinasse <walken at zoy.org>
  * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.

Index: motion_comp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/motion_comp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- motion_comp.c	9 Jun 2003 12:11:30 -0000	1.5
+++ motion_comp.c	17 Jun 2003 22:54:45 -0000	1.6
@@ -1,6 +1,6 @@
 /*
  * motion_comp.c
- * Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
+ * Copyright (C) 2000-2003 Michel Lespinasse <walken at zoy.org>
  * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.

Index: motion_comp_mlib.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/motion_comp_mlib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- motion_comp_mlib.c	6 Apr 2003 16:36:02 -0000	1.3
+++ motion_comp_mlib.c	17 Jun 2003 22:54:45 -0000	1.4
@@ -1,6 +1,6 @@
 /*
  * motion_comp_mlib.c
- * Copyright (C) 2000-2002 Håkan Hjort <d95hjort at dtek.chalmers.se>
+ * Copyright (C) 2000-2003 Håkan Hjort <d95hjort at dtek.chalmers.se>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
  * See http://libmpeg2.sourceforge.net/ for updates.

Index: motion_comp_mmx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/motion_comp_mmx.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- motion_comp_mmx.c	6 Apr 2003 16:36:02 -0000	1.3
+++ motion_comp_mmx.c	17 Jun 2003 22:54:45 -0000	1.4
@@ -1,6 +1,6 @@
 /*
  * motion_comp_mmx.c
- * Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
+ * Copyright (C) 2000-2003 Michel Lespinasse <walken at zoy.org>
  * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.