From 7665fe72aad991316f2d4247de866d70321f178e Mon Sep 17 00:00:00 2001 From: Christophe Massiot Date: Mon, 3 Mar 2003 23:48:41 +0000 Subject: [PATCH] * mpeg_video is back as a built-in because it is reproduceably faster than as a plug-in, * Another desperate attempt at fixing OS X lock-ups. --- configure.ac.in | 7 +++---- include/vlc_threads.h | 12 ++++++------ modules/demux/avi/avi.c | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index f3c706c017..4af7bc5b70 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -798,11 +798,10 @@ AM_CONDITIONAL(CPROF, test "${enable_gprof}" = "yes") dnl dnl default modules dnl +BUILTINS="${BUILTINS} mpeg_video idct idctclassic motion" PLUGINS="${PLUGINS} dummy rc logger gestures access_file memcpy" PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv" -PLUGINS="${PLUGINS} idct idctclassic motion mpeg_video spudec mpeg_audio" -#PLUGINS="${PLUGINS} a52old imdct downmix imdct3dn downmix3dn imdctsse downmixsse" -PLUGINS="${PLUGINS} lpcm a52 cinepak" +PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 cinepak" PLUGINS="${PLUGINS} deinterlace invert adjust wall transform distort clone crop motionblur" PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32" PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler bandlimited_resampler" @@ -956,7 +955,7 @@ dnl if test "x${target_cpu}" = "xi686" -o "x${target_cpu}" = "xi586" -o "x${target_cpu}" = "xx86" -o "x${target_cpu}" = "xi386" then ARCH="${ARCH} mmx" - PLUGINS="${PLUGINS} ${ACCEL_MODULES}" + BUILTINS="${BUILTINS} ${ACCEL_MODULES}" fi dnl diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 5263b332aa..0205141ae1 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -3,7 +3,7 @@ * This header provides portable declarations for mutexes & conditions ***************************************************************************** * Copyright (C) 1999, 2002 VideoLAN - * $Id: vlc_threads.h,v 1.29 2003/02/27 08:19:02 massiot Exp $ + * $Id: vlc_threads.h,v 1.30 2003/03/03 23:48:41 massiot Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -72,11 +72,11 @@ /* Thread priorities */ #ifdef SYS_DARWIN -# define VLC_THREAD_PRIORITY_LOW 37 -# define VLC_THREAD_PRIORITY_INPUT 37 -# define VLC_THREAD_PRIORITY_AUDIO 37 -# define VLC_THREAD_PRIORITY_VIDEO 37 -# define VLC_THREAD_PRIORITY_OUTPUT 37 +# define VLC_THREAD_PRIORITY_LOW 1 +# define VLC_THREAD_PRIORITY_INPUT 1 +# define VLC_THREAD_PRIORITY_AUDIO 1 +# define VLC_THREAD_PRIORITY_VIDEO 1 +# define VLC_THREAD_PRIORITY_OUTPUT 1 #elif defined(WIN32) || defined(UNDER_CE) /* Define different priorities for WinNT/2K/XP and Win9x/Me */ diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index 94c6f9eae2..169dcc6edb 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -2,7 +2,7 @@ * avi.c : AVI file Stream input module for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: avi.c,v 1.38 2003/02/28 17:23:35 fenrir Exp $ + * $Id: avi.c,v 1.39 2003/03/03 23:48:41 massiot Exp $ * Authors: Laurent Aimar * * This program is free software; you can redistribute it and/or modify @@ -65,7 +65,7 @@ vlc_module_begin(); N_("force index creation"), N_("force index creation"), VLC_TRUE ); - set_description( _("avi demuxer") ); + set_description( N_("avi demuxer") ); set_capability( "demux", 212 ); set_callbacks( AVIInit, __AVIEnd ); vlc_module_end(); -- 2.39.5