From 1cfb64af268a5db4a0c84cf42b9f65ece9318ea1 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 17 Jun 2003 22:54:45 +0000 Subject: sync with libmpeg2 cvs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10304 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpeg2/alloc.c | 2 +- libmpeg2/cpu_accel.c | 17 ++++++++++++----- libmpeg2/idct_mlib.c | 2 +- libmpeg2/idct_mmx.c | 2 +- libmpeg2/motion_comp.c | 2 +- libmpeg2/motion_comp_mlib.c | 2 +- libmpeg2/motion_comp_mmx.c | 2 +- 7 files changed, 18 insertions(+), 11 deletions(-) (limited to 'libmpeg2') diff --git a/libmpeg2/alloc.c b/libmpeg2/alloc.c index 0a434d9782..2e4792e94d 100644 --- a/libmpeg2/alloc.c +++ b/libmpeg2/alloc.c @@ -1,6 +1,6 @@ /* * alloc.c - * Copyright (C) 2000-2002 Michel Lespinasse + * Copyright (C) 2000-2003 Michel Lespinasse * Copyright (C) 1999-2000 Aaron Holtzman * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. diff --git a/libmpeg2/cpu_accel.c b/libmpeg2/cpu_accel.c index 809deabcd7..b87e8096fc 100644 --- a/libmpeg2/cpu_accel.c +++ b/libmpeg2/cpu_accel.c @@ -1,6 +1,6 @@ /* * cpu_accel.c - * Copyright (C) 2000-2002 Michel Lespinasse + * Copyright (C) 2000-2003 Michel Lespinasse * Copyright (C) 1999-2000 Aaron Holtzman * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. @@ -126,20 +126,27 @@ static RETSIGTYPE sigill_handler (int sig) 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 */ diff --git a/libmpeg2/idct_mlib.c b/libmpeg2/idct_mlib.c index eae2a2f1be..83c39738d8 100644 --- a/libmpeg2/idct_mlib.c +++ b/libmpeg2/idct_mlib.c @@ -1,6 +1,6 @@ /* * idct_mlib.c - * Copyright (C) 1999-2002 Håkan Hjort + * Copyright (C) 1999-2003 Håkan Hjort * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. * See http://libmpeg2.sourceforge.net/ for updates. diff --git a/libmpeg2/idct_mmx.c b/libmpeg2/idct_mmx.c index 4915b93750..e2afe6bb45 100644 --- a/libmpeg2/idct_mmx.c +++ b/libmpeg2/idct_mmx.c @@ -1,6 +1,6 @@ /* * idct_mmx.c - * Copyright (C) 2000-2002 Michel Lespinasse + * Copyright (C) 2000-2003 Michel Lespinasse * Copyright (C) 1999-2000 Aaron Holtzman * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c index 0e6788f169..0ef3cf30bf 100644 --- a/libmpeg2/motion_comp.c +++ b/libmpeg2/motion_comp.c @@ -1,6 +1,6 @@ /* * motion_comp.c - * Copyright (C) 2000-2002 Michel Lespinasse + * Copyright (C) 2000-2003 Michel Lespinasse * Copyright (C) 1999-2000 Aaron Holtzman * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. diff --git a/libmpeg2/motion_comp_mlib.c b/libmpeg2/motion_comp_mlib.c index de181c0651..c7ed6b285a 100644 --- a/libmpeg2/motion_comp_mlib.c +++ b/libmpeg2/motion_comp_mlib.c @@ -1,6 +1,6 @@ /* * motion_comp_mlib.c - * Copyright (C) 2000-2002 Håkan Hjort + * Copyright (C) 2000-2003 Håkan Hjort * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. * See http://libmpeg2.sourceforge.net/ for updates. diff --git a/libmpeg2/motion_comp_mmx.c b/libmpeg2/motion_comp_mmx.c index 33103e1738..2434ccee11 100644 --- a/libmpeg2/motion_comp_mmx.c +++ b/libmpeg2/motion_comp_mmx.c @@ -1,6 +1,6 @@ /* * motion_comp_mmx.c - * Copyright (C) 2000-2002 Michel Lespinasse + * Copyright (C) 2000-2003 Michel Lespinasse * Copyright (C) 1999-2000 Aaron Holtzman * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. -- cgit v1.2.3