From 7e9a5ca50a6ff68d67d1ec29941869e46d526c94 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 1 May 2008 12:30:29 +0000 Subject: Enable Alpha/ARM optimizations in libmpeg2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26626 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_libmpeg2.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index c8ca0e92b6..2847491e55 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -78,7 +78,16 @@ static int init(sh_video_t *sh){ accel |= MPEG2_ACCEL_X86_SSE2; if(gCpuCaps.hasAltiVec) accel |= MPEG2_ACCEL_PPC_ALTIVEC; - #ifdef HAVE_VIS + #ifdef ARCH_ALPHA + accel |= MPEG2_ACCEL_ALPHA; + #elif ARCH_ARM + accel |= MPEG2_ACCEL_ARM; + #endif + #ifdef HAVE_IWMMXT + accel |= MPEG2_ACCEL_ARM_IWMMXT; + #elif HAVE_MVI + accel |= MPEG2_ACCEL_ALPHA_MVI; + #elif HAVE_VIS accel |= MPEG2_ACCEL_SPARC_VIS; #endif mpeg2_accel(accel); -- cgit v1.2.3 From e9de5ea8dfd94ce8da8247dfd52e552ce69df268 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 7 May 2008 07:49:35 +0000 Subject: Relicense file as GPL v2+; bero granted permission on IRC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26679 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ve_x264.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index dadfb748d9..a4b6c40902 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -7,21 +7,21 @@ * * Written by Bernhard Rosenkraenzer * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation, or if, and only if, - * version 2 is ruled invalid in a court of law, any later version - * of the GNU General Public License published by the Free Software - * Foundation. + * This file is part of MPlayer. * - * This program is distributed in the hope that it will be useful, + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTIBILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * *****************************************************************************/ -- cgit v1.2.3