From e4b700c6f8db40de885970069b8eea772a59a183 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 21:49:25 +0000 Subject: CVS --> Subversion git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27689 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index ce55855c1a..28b5a4cfc4 100755 --- a/configure +++ b/configure @@ -3,7 +3,7 @@ # Original version (C) 2000 Pontscho/fresh!mindworkz # pontscho@makacs.poliod.hu # -# History / Contributors: check the cvs log ! +# History / Contributors: Check the Subversion log. # # Cleanups all over the place (c) 2001 pl # -- cgit v1.2.3 From 1b697bc8d6514a7c3c203d0770b183b7fc395ec4 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 21:54:21 +0000 Subject: whitespace cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27690 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 92febf4f3e..6af1df11f9 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -9095,7 +9095,6 @@ FIXME: Document this. FIXME: Document this. . . -. .SS nuv (\-nuvopts) . Nuppel video is based on RTJPEG and LZO. @@ -10517,7 +10516,6 @@ Encryption key the demuxer should use. This is the raw binary data of the key converted to a hexadecimal string. . . -. .SS FFmpeg libavformat muxers (\-lavfopts) (also see \-of lavf) . .TP -- cgit v1.2.3 From c378cd84bebb84e085576d36f8ee278f5f145994 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 21:55:05 +0000 Subject: vo_fbdev now supports -geometry. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27691 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 6af1df11f9..a63b5e482e 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3080,7 +3080,7 @@ than the screen. .br .I NOTE: This option is only supported by the x11, xmga, xv, xvmc, xvidix, -gl, gl2, directx and tdfxfb video output drivers. +gl, gl2, directx, fbdev and tdfxfb video output drivers. .sp 1 .I EXAMPLE: .PD 0 -- cgit v1.2.3 From 8a0c673c032f548f1f53d0efc263d1ffab32f623 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 22:39:06 +0000 Subject: Fix vsscanf test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27692 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 28b5a4cfc4..25401dd37d 100755 --- a/configure +++ b/configure @@ -3441,7 +3441,9 @@ echores "$_strsep" echocheck "vsscanf()" cat > $TMPC << EOF +#define _ISOC99_SOURCE #include +#include int main(void) { vsscanf(0, 0, 0); return 0; } EOF _vsscanf=no -- cgit v1.2.3 From 6c9eadf059e9ef87a7b11ae7cd71b66dfa9855d3 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 22:46:33 +0000 Subject: spelling cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27693 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 25401dd37d..b421337866 100755 --- a/configure +++ b/configure @@ -6021,9 +6021,8 @@ if test "$_theora" = auto ; then #include #include int main(void) { - /* theora is in flux, make sure that all interface routines and - * datatypes exist and work the way we expect it, so we don't break - * mplayer */ ++ /* Theora is in flux, make sure that all interface routines and datatypes ++ * exist and work the way we expect it, so we don't break MPlayer. */ ogg_packet op; theora_comment tc; theora_info inf; -- cgit v1.2.3 From c4c2d9421499e396a318f0224ff48f4c63e8e733 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 22:49:53 +0000 Subject: 100l copy and paste typo fix git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27694 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b421337866..90da5171b0 100755 --- a/configure +++ b/configure @@ -6021,8 +6021,8 @@ if test "$_theora" = auto ; then #include #include int main(void) { -+ /* Theora is in flux, make sure that all interface routines and datatypes -+ * exist and work the way we expect it, so we don't break MPlayer. */ + /* Theora is in flux, make sure that all interface routines and datatypes + * exist and work the way we expect it, so we don't break MPlayer. */ ogg_packet op; theora_comment tc; theora_info inf; -- cgit v1.2.3 From 78066d185ed46c36775b4311500b18456c5aa08e Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 23:44:40 +0000 Subject: Remove MinGW cruft. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27695 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/netstream.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/TOOLS/netstream.c b/TOOLS/netstream.c index 0009f673f6..4a44e9581a 100644 --- a/TOOLS/netstream.c +++ b/TOOLS/netstream.c @@ -59,11 +59,6 @@ char* out_filename = NULL; char* force_fourcc=NULL; char* passtmpfile="divx2pass.log"; -#ifdef __MINGW32__ -#define usleep sleep -void strsep() {}; -#endif - static unsigned short int port = 10000; typedef struct client_st client_t; -- cgit v1.2.3 From 6685ee530bcfff8544e3d9221fe1791f1282556f Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 09:27:46 +0000 Subject: Skip setting variables to empty values in the CPU detection code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27696 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/configure b/configure index 90da5171b0..d21e34b2ef 100755 --- a/configure +++ b/configure @@ -1888,10 +1888,6 @@ EOF _arch='IA64' _target_arch='ARCH_IA64 = yes' iproc='ia64' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; x86_64|amd64) @@ -1996,7 +1992,6 @@ EOF else proc=v8 fi - _march='' _mcpu="-mcpu=$proc" _optimizing="$proc" ;; @@ -2007,7 +2002,6 @@ EOF _vis='yes' iproc='sparc' proc='ultrasparc' - _march='' _mcpu="-mcpu=$proc" _optimizing="$proc" ;; @@ -2016,20 +2010,12 @@ EOF _arch='ARM ARMV4L' _target_arch='ARCH_ARMV4L = yes' iproc='arm' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; sh) _arch='SH' _target_arch='ARCH_SH = yes' iproc='sh' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; ppc|ppc64|powerpc|powerpc64) @@ -2037,10 +2023,6 @@ EOF _def_dcbzl='#undef HAVE_DCBZL' _target_arch='ARCH_POWERPC = yes' iproc='ppc' - proc='' - _march='' - _mcpu='' - _optimizing='' echocheck "CPU type" case $system_name in @@ -2148,7 +2130,6 @@ EOF _arch='ALPHA' _target_arch='ARCH_ALPHA = yes' iproc='alpha' - _march='' echocheck "CPU type" cat > $TMPC << EOF @@ -2190,10 +2171,6 @@ EOF _arch='SGI_MIPS' _target_arch='ARCH_SGI_MIPS = yes' iproc='sgi-mips' - proc='' - _march='' - _mcpu='' - _optimizing='' if irix ; then echocheck "CPU type" @@ -2219,60 +2196,35 @@ EOF _arch='PA_RISC' _target_arch='ARCH_PA_RISC = yes' iproc='PA-RISC' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; s390) _arch='S390' _target_arch='ARCH_S390 = yes' iproc='390' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; s390x) _arch='S390X' _target_arch='ARCH_S390X = yes' iproc='390x' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; vax) _arch='VAX' _target_arch='ARCH_VAX = yes' iproc='vax' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; xtensa) _arch='XTENSA' _target_arch='ARCH_XTENSA = yes' iproc='xtensa' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; generic) _arch='GENERIC' _target_arch='ARCH_GENERIC = yes' - iproc='' - proc='' - _march='' - _mcpu='' - _optimizing='' ;; *) -- cgit v1.2.3 From 677ce98c852369c6b1c1aa6f4928c1713c7351cb Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 09:38:10 +0000 Subject: Merge SPARC and SPARC64 sections in the CPU detection code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27697 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/configure b/configure index d21e34b2ef..e418f95303 100755 --- a/configure +++ b/configure @@ -1972,11 +1972,14 @@ EOF echores "$proc" ;; - sparc) + sparc|sparc64) _arch='SPARC' _target_arch='ARCH_SPARC = yes' iproc='sparc' - if sunos ; then + if test "$host_arch" = "sparc64" ; then + _vis='yes' + proc='ultrasparc' + elif sunos ; then echocheck "CPU type" karch=`uname -m` case "`echo $karch`" in @@ -1996,16 +1999,6 @@ EOF _optimizing="$proc" ;; - sparc64) - _arch='SPARC' - _target_arch='ARCH_SPARC = yes' - _vis='yes' - iproc='sparc' - proc='ultrasparc' - _mcpu="-mcpu=$proc" - _optimizing="$proc" - ;; - arm|armv4l|armv5tel) _arch='ARM ARMV4L' _target_arch='ARCH_ARMV4L = yes' -- cgit v1.2.3 From 4d040d35d09bcdb488e528fb4c8dcce568fd2556 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 09:52:07 +0000 Subject: Remove MPlayer-specific MP_WORDSIZE hack. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27698 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/rgb2rgb_template.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index c98c080978..ce72179ea3 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -30,11 +30,6 @@ #include #include /* for __WORDSIZE */ -#ifndef __WORDSIZE -// #warning You have a misconfigured system and will probably lose performance! -#define __WORDSIZE MP_WORDSIZE -#endif - #undef PREFETCH #undef MOVNTQ #undef EMMS -- cgit v1.2.3 From 526cfa28a225aaf274a80f3cd8d968a3485768e8 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 10:16:48 +0000 Subject: Remove word size check and macro and use __WORDSIZE directly instead. It has been done this way in libswscale for years without apparent ill effect. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27699 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 13 ------------- libmpcodecs/vf_divtc.c | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/configure b/configure index e418f95303..86b436061d 100755 --- a/configure +++ b/configure @@ -2927,17 +2927,6 @@ fi echores "$_fast_inttypes" -echocheck "word size" -_mp_wordsize="#undef MP_WORDSIZE" -cat > $TMPC << EOF -#include -#include -int main(void) { printf("%d\n", sizeof(size_t)*8); return 0; } -EOF -cc_check && _wordsize=`$TMPEXE` && _mp_wordsize="#define MP_WORDSIZE $_wordsize" -echores "$_wordsize" - - echocheck "malloc.h" cat > $TMPC << EOF #include @@ -8500,8 +8489,6 @@ $_def_confwin32 /* Define this to any prefered value from 386 up to infinity with step 100 */ #define __CPU__ $iproc -$_mp_wordsize - $_def_vcd #ifdef sun diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c index d2fcb48dbe..6c97463f4b 100644 --- a/libmpcodecs/vf_divtc.c +++ b/libmpcodecs/vf_divtc.c @@ -128,7 +128,7 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z, unsigned int shift; uint32_t sum, t; unsigned char *e, *e2; -#if MP_WORDSIZE==64 +#if __WORDSIZE==64 typedef uint64_t wsum_t; #else typedef uint32_t wsum_t; @@ -143,7 +143,7 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z, for(wsum=0, e2=e-sizeof(wsum_t)+1; p>32^wsum)); #else t=be2me_32(wsum); -- cgit v1.2.3 From 220ec4f1250b108313abce1ad53532d53d0a5ce9 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 10:18:42 +0000 Subject: FAAC/FAAD are no longer the only available AAC encoders/decoders. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27700 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 86b436061d..361820a3d6 100755 --- a/configure +++ b/configure @@ -6110,7 +6110,7 @@ fi echores "$_musepack" -echocheck "FAAC (AAC encoder) support" +echocheck "FAAC support" if test "$_faac" = auto ; then cat > $TMPC < @@ -6141,7 +6141,7 @@ _res_comment="in libavcodec: $_faac_lavc" echores "$_faac" -echocheck "FAAD2 (AAC) support" +echocheck "FAAD2 support" if test "$_faad_internal" = auto ; then if x86_32 && test cc_vendor=gnu; then case $cc_version in -- cgit v1.2.3 From b92479505663bed04bf9b4178d46de648266104b Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 10:39:29 +0000 Subject: Do not set DESTDIR to an empty value so that it can be overridden on the command line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27701 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 361820a3d6..59dc36995d 100755 --- a/configure +++ b/configure @@ -7762,7 +7762,6 @@ MAN_LANG = $man_lang MAN_LANGS = $man_langs MAN_LANG_ALL = $man_lang_all -DESTDIR = prefix = \$(DESTDIR)$_prefix BINDIR = \$(DESTDIR)$_bindir DATADIR = \$(DESTDIR)$_datadir -- cgit v1.2.3 From 40505981d73365aede3f58efbe356fc87093c1c9 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 10:53:28 +0000 Subject: Remove unused options --ar and --ranlib. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27702 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/configure b/configure index 59dc36995d..3e57c99925 100755 --- a/configure +++ b/configure @@ -409,8 +409,6 @@ Miscellaneous options: --cc=COMPILER C compiler to build MPlayer [gcc] --host-cc=COMPILER C compiler for tools needed while building [gcc] --as=ASSEMBLER assembler to build MPlayer [as] - --ar=AR librarian to build MPlayer [ar] - --ranlib=RANLIB ranlib to build MPlayer [ranlib] --windres=WINDRES windres to build MPlayer [windres] --target=PLATFORM target platform (i386-linux, arm-linux, etc) --enable-static build a statically linked binary @@ -488,10 +486,8 @@ _iwmmxt=auto _mtrr=auto _altivec=auto _install=install -_ranlib=ranlib _windres=windres _cc=cc -_ar=ar test "$CC" && _cc="$CC" _as=auto _runtime_cpudetection=no @@ -791,12 +787,6 @@ for ac_option do --as=*) _as=`echo $ac_option | cut -d '=' -f 2` ;; - --ar=*) - _ar=`echo $ac_option | cut -d '=' -f 2` - ;; - --ranlib=*) - _ranlib=`echo $ac_option | cut -d '=' -f 2` - ;; --windres=*) _windres=`echo $ac_option | cut -d '=' -f 2` ;; @@ -1385,12 +1375,6 @@ if aix ; then _ld_extra="$_ld_extra -lC" fi -if irix ; then - _ranlib='ar -r' -elif linux ; then - _ranlib='true' -fi - if win32 ; then _exesuf=".exe" # -lwinmm is always needed for osdep/timer-win2.c @@ -7769,11 +7753,9 @@ MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir LIBDIR = \$(DESTDIR)$_libdir -AR = $_ar CC = $_cc CXX = $_cc HOST_CC = $_host_cc -RANLIB = $_ranlib WINDRES = $_windres INSTALL = $_install INSTALLSTRIP = $_install_strip -- cgit v1.2.3 From e46c293c578ae1726cc2d603a4eb98801bd9cb71 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 10:57:57 +0000 Subject: Remove unused LIBDIR Makefile variable from config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27703 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 3e57c99925..80a8efc19f 100755 --- a/configure +++ b/configure @@ -7751,7 +7751,6 @@ BINDIR = \$(DESTDIR)$_bindir DATADIR = \$(DESTDIR)$_datadir MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir -LIBDIR = \$(DESTDIR)$_libdir CC = $_cc CXX = $_cc -- cgit v1.2.3 From c43243575c2318b20c974a1533d01295e57c5a0e Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 11:06:50 +0000 Subject: cosmetics: Move around stuff in config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27704 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 80a8efc19f..739bfbd9f7 100755 --- a/configure +++ b/configure @@ -7796,16 +7796,6 @@ VO_SRCS = $_vosrc MENCODER = $_mencoder MPLAYER = $_mplayer -#internal libraries -LIBA52 = $_liba52 -LIBA52_INTERNAL = $_liba52_internal -LIBMPEG2 = $_libmpeg2 -MP3LIB = $_mp3lib -TREMOR_INTERNAL = $_tremor_internal - -HAVE_SYS_MMAN_H = $_mman -HAVE_POSIX_SELECT = $_posix_select - NEED_GETTIMEOFDAY = $_need_gettimeofday NEED_GLOB = $_need_glob NEED_MMAP = $_need_mmap @@ -7815,12 +7805,9 @@ NEED_STRSEP = $_need_strsep NEED_SWAB = $_need_swab NEED_VSSCANF = $_need_vsscanf -# audio output -OSS = $_ossaudio -ALSA9 = $_alsa9 -ALSA1X = $_alsa1x - # features +ALSA1X = $_alsa1x +ALSA9 = $_alsa9 APPLE_IR = $_apple_ir APPLE_REMOTE = $_apple_remote AUDIO_INPUT = $_audio_input @@ -7842,9 +7829,13 @@ GIF = $_gif GUI = $_gui GUI_GTK = $_gui_gtk GUI_WIN32 = $_gui_win32 +HAVE_POSIX_SELECT = $_posix_select +HAVE_SYS_MMAN_H = $_mman JOYSTICK = $_joystick JPEG = $_jpeg LADSPA = $_ladspa +LIBA52 = $_liba52 +LIBA52_INTERNAL = $_liba52_internal LIBASS = $_ass LIBDCA = $_libdca LIBDV = $_libdv @@ -7853,6 +7844,7 @@ LIBLZO = $_liblzo LIBMAD = $_mad LIBMENU = $_menu LIBMENU_DVBIN = $_menu_dvbin +LIBMPEG2 = $_libmpeg2 LIBNEMESI = $_nemesi LIBNUT = $_libnut LIBSMBCLIENT = $_smb @@ -7863,9 +7855,11 @@ LIVE555 = $_live MACOSX_BUNDLE = $_macosx_bundle MACOSX_FINDER = $_macosx_finder MP3LAME = $_mp3lame +MP3LIB = $_mp3lib MUSEPACK = $_musepack NATIVE_RTSP = $_native_rtsp NETWORK = $_network +OSS = $_ossaudio PE_EXECUTABLE = $_pe_executable PNG = $_png PVR = $_pvr @@ -7879,6 +7873,7 @@ REAL_CODECS = $_real SPEEX = $_speex STREAM_CACHE = $_stream_cache TOOLAME=$_toolame +TREMOR_INTERNAL = $_tremor_internal TV = $_tv TV_BSDBT848 = $_tv_bsdbt848 TV_DSHOW = $_tv_dshow -- cgit v1.2.3 From 5b3b982baff4fd793d32f4ce2bef3f9eb32d2149 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 11:27:39 +0000 Subject: cosmetics: Move around some more stuff in config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27705 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 739bfbd9f7..5240975714 100755 --- a/configure +++ b/configure @@ -7739,6 +7739,7 @@ cat > config.mak << EOF # Ensure that locale settings do not interfere with shell commands. export LC_ALL = C +CHARSET = $_charset DOC_LANG = $doc_lang DOC_LANGS = $doc_langs DOC_LANG_ALL = $doc_lang_all @@ -7755,9 +7756,9 @@ CONFDIR = \$(DESTDIR)$_confdir CC = $_cc CXX = $_cc HOST_CC = $_host_cc -WINDRES = $_windres INSTALL = $_install INSTALLSTRIP = $_install_strip +WINDRES = $_windres EXTRA_INC = $_inc_extra EXTRAXX_INC = $_inc_extra $_inc_extraxx @@ -7778,21 +7779,24 @@ EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm EXTRALIBS_MPLAYER = $_libs_mplayer EXTRALIBS_MENCODER = $_libs_mencoder -CHARSET = $_charset -HELP_FILE = $_mp_help - -EXESUF = $_exesuf +DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&," -$_target_arch -$_target_arch_x86 -`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'` +MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," +MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," GETCH = $_getch +HELP_FILE = $_mp_help TIMER = $_timer AO_SRCS = $_aosrc VO_SRCS = $_vosrc +EXESUF = $_exesuf + +$_target_arch +$_target_arch_x86 +`echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/'` + MENCODER = $_mencoder MPLAYER = $_mplayer @@ -7831,6 +7835,7 @@ GUI_GTK = $_gui_gtk GUI_WIN32 = $_gui_win32 HAVE_POSIX_SELECT = $_posix_select HAVE_SYS_MMAN_H = $_mman +HAVE_XVMC = $_xvmc JOYSTICK = $_joystick JPEG = $_jpeg LADSPA = $_ladspa @@ -7954,7 +7959,6 @@ CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads HAVE_W32THREADS = $_w32threads -HAVE_XVMC = $_xvmc `echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` @@ -7962,12 +7966,6 @@ HAVE_XVMC = $_xvmc `echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavbsfs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` - -DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&," - -MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," -MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &," - EOF ############################################################################# -- cgit v1.2.3 From 6e916bbf28c95028420a9092828f6dd69b7181c4 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 11:42:39 +0000 Subject: Remove unused HAVE_SYS_POLL_H definition from config.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27706 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configure b/configure index 5240975714..45dcfaf464 100755 --- a/configure +++ b/configure @@ -7994,14 +7994,6 @@ cat > $TMPH << EOF #define CONFIGURATION "$_configuration" -/* make sure we never get lavformat's poll() emulation, the results are - horrible if the X libs try to actually use it, see MPlayer-users - Message-ID: <45D49541.8060101@infernix.net> - Date: Thu, 15 Feb 2007 18:15:45 +0100 - Subject: [MPlayer-users] Crash with backtrace when playing back demuxed... -*/ -#define HAVE_SYS_POLL_H 1 - /* yes, we have inttypes.h */ #define HAVE_INTTYPES_H 1 -- cgit v1.2.3 From 02c93f7b98d7634ad0c787675648b6d689b9837c Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 11:47:00 +0000 Subject: Do not duplicate likely/unlikely #defines from libmpeg2/libavcodec in config.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27707 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configure b/configure index 45dcfaf464..fa1d595065 100755 --- a/configure +++ b/configure @@ -8033,13 +8033,6 @@ $_def_restrict_keyword /* __builtin_expect branch prediction hint */ $_def_builtin_expect -#ifdef HAVE_BUILTIN_EXPECT -#define likely(x) __builtin_expect ((x) != 0, 1) -#define unlikely(x) __builtin_expect ((x) != 0, 0) -#else -#define likely(x) (x) -#define unlikely(x) (x) -#endif /* attribute(used) as needed by some compilers */ #if (__GNUC__ * 100 + __GNUC_MINOR__ >= 300) -- cgit v1.2.3 From b91df4ad96504f4355491e70bc7f6bb45807ba1a Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 12:14:38 +0000 Subject: cosmetics: Improve some config.h comments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27708 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/configure b/configure index fa1d595065..28a396b768 100755 --- a/configure +++ b/configure @@ -7997,7 +7997,7 @@ cat > $TMPH << EOF /* yes, we have inttypes.h */ #define HAVE_INTTYPES_H 1 -/* int_fastXY_t emulation */ +/* int_fastXY_t emulation, libmpeg2 + FFmpeg */ $_def_fast_inttypes /* libdvdcss */ @@ -8031,7 +8031,7 @@ $_def_dynamic_plugins /* "restrict" keyword */ $_def_restrict_keyword -/* __builtin_expect branch prediction hint */ +/* __builtin_expect branch prediction hint, libmpeg2 + FFmpeg */ $_def_builtin_expect /* attribute(used) as needed by some compilers */ @@ -8245,11 +8245,11 @@ $_def_corevideo $_def_quartz $_def_quicktime -/* Build our Win32-loader */ +/* Win32-loader support */ $_def_win32_loader /* FFmpeg */ -/* Define this to enable image postprocessing in libavcodec (requires a FAST CPU!) */ +/* Define this to enable image postprocessing in libavcodec */ $_def_libpostproc $_def_libpostproc_a $_def_libpostproc_so @@ -8331,6 +8331,8 @@ $_def_mp3lib /* enable liba52 support */ $_def_liba52_internal $_def_liba52 + +/* enable libmpeg2 support */ $_def_libmpeg2 /* XAnim DLL support */ @@ -8355,7 +8357,7 @@ $_def_fastmemcpy /* Use UnRAR executable for Vobsubs */ $_def_unrar_exec -/* gui support, please do not edit this option */ +/* gui support */ $_def_gui $_def_gtk2 @@ -8650,7 +8652,8 @@ $_def_gethostbyname2 /* Extension defines */ `ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"` -$_def_altivec_h // enables usage of altivec.h +/* altivec.h support */ +$_def_altivec_h /* libvo options */ #define SCREEN_SIZE_X 1 -- cgit v1.2.3 From 5fa09d26e014356b1efa451a246d844df0df2902 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 12:24:18 +0000 Subject: 100l: Revert incorrect removal or --ar and --ranlib options. They are still needed for FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27709 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configure b/configure index 28a396b768..eb5f16b448 100755 --- a/configure +++ b/configure @@ -409,6 +409,8 @@ Miscellaneous options: --cc=COMPILER C compiler to build MPlayer [gcc] --host-cc=COMPILER C compiler for tools needed while building [gcc] --as=ASSEMBLER assembler to build MPlayer [as] + --ar=AR librarian to build MPlayer [ar] + --ranlib=RANLIB ranlib to build MPlayer [ranlib] --windres=WINDRES windres to build MPlayer [windres] --target=PLATFORM target platform (i386-linux, arm-linux, etc) --enable-static build a statically linked binary @@ -486,8 +488,10 @@ _iwmmxt=auto _mtrr=auto _altivec=auto _install=install +_ranlib=ranlib _windres=windres _cc=cc +_ar=ar test "$CC" && _cc="$CC" _as=auto _runtime_cpudetection=no @@ -787,6 +791,12 @@ for ac_option do --as=*) _as=`echo $ac_option | cut -d '=' -f 2` ;; + --ar=*) + _ar=`echo $ac_option | cut -d '=' -f 2` + ;; + --ranlib=*) + _ranlib=`echo $ac_option | cut -d '=' -f 2` + ;; --windres=*) _windres=`echo $ac_option | cut -d '=' -f 2` ;; @@ -1375,6 +1385,12 @@ if aix ; then _ld_extra="$_ld_extra -lC" fi +if irix ; then + _ranlib='ar -r' +elif linux ; then + _ranlib='true' +fi + if win32 ; then _exesuf=".exe" # -lwinmm is always needed for osdep/timer-win2.c @@ -7753,11 +7769,13 @@ DATADIR = \$(DESTDIR)$_datadir MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir +AR = $_ar CC = $_cc CXX = $_cc HOST_CC = $_host_cc INSTALL = $_install INSTALLSTRIP = $_install_strip +RANLIB = $_ranlib WINDRES = $_windres EXTRA_INC = $_inc_extra -- cgit v1.2.3 From 34e161377a336b1b127ff8014c51285419129629 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 12:39:16 +0000 Subject: cosmetics: Reorder entries in config.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27710 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 205 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 102 insertions(+), 103 deletions(-) diff --git a/configure b/configure index eb5f16b448..13d7981573 100755 --- a/configure +++ b/configure @@ -8010,6 +8010,26 @@ cat > $TMPH << EOF #ifndef MPLAYER_CONFIG_H #define MPLAYER_CONFIG_H +/* Undefine this if you do not want to select mono audio (left or right) + with a stereo MPEG layer 2/3 audio stream. The command line option + -stereo has three possible values (0 for stereo, 1 for left-only, 2 for + right-only), with 0 being the default. + */ +#define CONFIG_FAKE_MONO 1 + +/* set up max. outburst. use 65536 for ALSA 0.5, for others 16384 is enough */ +#define MAX_OUTBURST 65536 + +/* set up audio OUTBURST. Do not change this! */ +#define OUTBURST 512 + +/* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */ +#undef FAST_OSD +#undef FAST_OSD_TABLE + +/* Define this to enable MPEG-1/2 image postprocessing in libmpeg2 */ +#define MPEG12_POSTPROC 1 + #define CONFIGURATION "$_configuration" /* yes, we have inttypes.h */ @@ -8123,13 +8143,6 @@ $_def_mp3lame $_def_mp3lame_preset $_def_mp3lame_preset_medium -/* Undefine this if you do not want to select mono audio (left or right) - with a stereo MPEG layer 2/3 audio stream. The command line option - -stereo has three possible values (0 for stereo, 1 for left-only, 2 for - right-only), with 0 being the default. - */ -#define CONFIG_FAKE_MONO 1 - /* Undefine this if your sound card driver has no working select(). If you have kernel Oops, player hangups, or just no audio, you should try to recompile MPlayer with this option disabled! */ @@ -8144,12 +8157,6 @@ $_def_langinfo /* define this to use RTC (/dev/rtc) for video timers */ $_def_rtc -/* set up max. outburst. use 65536 for ALSA 0.5, for others 16384 is enough */ -#define MAX_OUTBURST 65536 - -/* set up audio OUTBURST. Do not change this! */ -#define OUTBURST 512 - /* Define this if your system has the header file for the OSS sound interface */ $_def_sys_soundcard @@ -8245,12 +8252,6 @@ $_def_lircc /* DVD navigation support using libdvdnav */ $_def_dvdnav -/* Define this to enable MPEG 1/2 image postprocessing (requires a FAST CPU!) */ -#define MPEG12_POSTPROC 1 - -/* maximum alignment used by libmpeg2 */ -#define ATTRIBUTE_ALIGNED_MAX 16 - /* Win32 DLL support */ $_def_win32dll #define WIN32_PATH "$_win32codecsdir" @@ -8266,83 +8267,6 @@ $_def_quicktime /* Win32-loader support */ $_def_win32_loader -/* FFmpeg */ -/* Define this to enable image postprocessing in libavcodec */ -$_def_libpostproc -$_def_libpostproc_a -$_def_libpostproc_so - -/* Define this if you enabled thread support for libavcodec */ -$_def_threads -#ifdef HAVE_THREADS -#define ENABLE_THREADS 1 -#else -#define ENABLE_THREADS 0 -#endif - -/* ffmpeg's libavcodec support (requires libavcodec source) */ -$_def_libavcodec -$_def_libavcodec_a -$_def_libavcodec_so -$_def_libavcodec_mpegaudio_hp - -/* ffmpeg's libavformat support (requires libavformat source) */ -$_def_libavformat -$_def_libavformat_a -$_def_libavformat_so - -$_def_libavutil -$_def_libavutil_a -$_def_libavutil_so - -$_def_libswscale -$_def_libswscale_a -$_def_libswscale_so - -/* Use libavcodec's decoders */ -#define CONFIG_DECODERS 1 -#define ENABLE_DECODERS 1 -/* Use libavcodec's encoders */ -#define CONFIG_ENCODERS 1 -#define ENABLE_ENCODERS 1 - -/* Use libavformat's demuxers */ -#define CONFIG_DEMUXERS 1 -#define ENABLE_DEMUXERS 1 -/* Use libavformat's muxers */ -$_def_muxers - -/* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */ -#define HAVE_EBX_AVAILABLE 1 -#ifndef MP_DEBUG -#define HAVE_EBP_AVAILABLE 1 -#endif - -#define CONFIG_GPL 1 -#define ENABLE_SMALL 0 -#define ENABLE_GRAY 0 - -/* Use AMR codecs from libavcodec. */ -$_def_libamr -$_def_libamr_nb -$_def_libamr_wb - -/* Use specific parts from FFmpeg. */ -`ff_config_enable "$_libavdecoders_all" "$_libavdecoders"` -`ff_config_enable "$_libavencoders_all" "$_libavencoders"` -`ff_config_enable "$_libavparsers_all" "$_libavparsers"` -`ff_config_enable "$_libavdemuxers_all" "$_libavdemuxers"` -`ff_config_enable "$_libavmuxers_all" "$_libavmuxers"` -`ff_config_enable "$_libavprotocols_all" "$_libavprotocols"` -`ff_config_enable "$_libavbsfs_all" "$_libavbsfs"` - -$_def_libdirac_lavc -$_def_faac_lavc -$_def_mp3lame_lavc -$_def_libschroedinger_lavc -$_def_x264_lavc -$_def_xvid_lavc - /* Use codec libs included in mplayer CVS / source dist: */ $_def_mp3lib @@ -8353,6 +8277,9 @@ $_def_liba52 /* enable libmpeg2 support */ $_def_libmpeg2 +/* maximum alignment used by libmpeg2 */ +#define ATTRIBUTE_ALIGNED_MAX 16 + /* XAnim DLL support */ $_def_xanim /* Default search path */ @@ -8401,10 +8328,6 @@ $_def_sgiaudio $_def_win32waveout $_def_nas -/* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */ -#undef FAST_OSD -#undef FAST_OSD_TABLE - /* Enable TV Interface support */ $_def_tv @@ -8511,9 +8434,6 @@ $_def_lrintf $_def_round $_def_roundf -/* mkstemp support */ -$_def_mkstemp - /* nanosleep support */ $_def_nanosleep @@ -8731,6 +8651,85 @@ $_def_xshape #define X11_FULLSCREEN 1 #endif +/* FFmpeg */ +/* Define this to enable image postprocessing in libavcodec */ +$_def_libpostproc +$_def_libpostproc_a +$_def_libpostproc_so + +/* ffmpeg's libavcodec support (requires libavcodec source) */ +$_def_libavcodec +$_def_libavcodec_a +$_def_libavcodec_so +$_def_libavcodec_mpegaudio_hp + +/* ffmpeg's libavformat support (requires libavformat source) */ +$_def_libavformat +$_def_libavformat_a +$_def_libavformat_so + +$_def_libavutil +$_def_libavutil_a +$_def_libavutil_so + +$_def_libswscale +$_def_libswscale_a +$_def_libswscale_so + +/* Define this if you enabled thread support for libavcodec */ +$_def_threads +#ifdef HAVE_THREADS +#define ENABLE_THREADS 1 +#else +#define ENABLE_THREADS 0 +#endif + +/* Use libavcodec's decoders */ +#define CONFIG_DECODERS 1 +#define ENABLE_DECODERS 1 +/* Use libavcodec's encoders */ +#define CONFIG_ENCODERS 1 +#define ENABLE_ENCODERS 1 + +/* Use libavformat's demuxers */ +#define CONFIG_DEMUXERS 1 +#define ENABLE_DEMUXERS 1 +/* Use libavformat's muxers */ +$_def_muxers + +/* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */ +#define HAVE_EBX_AVAILABLE 1 +#ifndef MP_DEBUG +#define HAVE_EBP_AVAILABLE 1 +#endif + +#define CONFIG_GPL 1 +#define ENABLE_SMALL 0 +#define ENABLE_GRAY 0 + +/* External libraries used through libavcodec. */ +$_def_faac_lavc +$_def_libamr +$_def_libamr_nb +$_def_libamr_wb +$_def_libdirac_lavc +$_def_libschroedinger_lavc +$_def_mp3lame_lavc +$_def_x264_lavc +$_def_xvid_lavc + +/* mkstemp support */ +$_def_mkstemp + +/* Use specific parts from FFmpeg. */ +`ff_config_enable "$_libavdecoders_all" "$_libavdecoders"` +`ff_config_enable "$_libavencoders_all" "$_libavencoders"` +`ff_config_enable "$_libavparsers_all" "$_libavparsers"` +`ff_config_enable "$_libavdemuxers_all" "$_libavdemuxers"` +`ff_config_enable "$_libavmuxers_all" "$_libavmuxers"` +`ff_config_enable "$_libavprotocols_all" "$_libavprotocols"` +`ff_config_enable "$_libavbsfs_all" "$_libavbsfs"` + #endif /* MPLAYER_CONFIG_H */ EOF -- cgit v1.2.3 From 975e5a97e2afb56e48bf0318ed19f94fb09e2feb Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 13:07:31 +0000 Subject: cosmetics: more config.h reordering git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27711 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 431 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 213 insertions(+), 218 deletions(-) diff --git a/configure b/configure index 13d7981573..4ff899c568 100755 --- a/configure +++ b/configure @@ -8003,10 +8003,13 @@ done echo "Creating config.h" cat > $TMPH << EOF -/* -------- This file has been automatically generated by configure --------- - Note: Any changes in it will be lost when you run configure again. */ +/*---------------------------------------------------------------------------- +** This file has been automatically generated by configure any changes in it +** will be lost when you run configure again. +** Instead of modifying definitions here, use the --enable/--disable options +** of the configure script! See ./configure --help for details. +*---------------------------------------------------------------------------*/ -/* Protect against multiple inclusion */ #ifndef MPLAYER_CONFIG_H #define MPLAYER_CONFIG_H @@ -8032,6 +8035,11 @@ cat > $TMPH << EOF #define CONFIGURATION "$_configuration" +/* Common data directory (for fonts, etc) */ +#define MPLAYER_DATADIR "$_datadir" +#define MPLAYER_CONFDIR "$_confdir" +#define MPLAYER_LIBDIR "$_libdir" + /* yes, we have inttypes.h */ #define HAVE_INTTYPES_H 1 @@ -8057,15 +8065,51 @@ $_def_fast_inttypes /* libdvdread */ #define HAVE_UINTPTR_T 1 +/* C99 *lrint* and round* functions available */ +$_def_llrint +$_def_lrint +$_def_lrintf +$_def_round +$_def_roundf + +/* nanosleep support */ +$_def_nanosleep + /* name of messages charset */ $_def_charset /* Runtime CPU detection */ $_def_runtime_cpudetection +/* Define if your processor stores words with the most significant + byte first (like Motorola and SPARC, unlike Intel and VAX). */ +$_def_words_endian + +/* Define if your processor can access unaligned data in a fast way */ +$_def_fast_unaligned + +`ff_config_enable "$_arch_all" "$_arch" "ARCH"` + +/* Extension defines */ +`ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"` + +/* altivec.h support */ +$_def_altivec_h + +/* For the PPC. G5 has the dcbzl when in 64bit mode but G4s and earlier do not + have the instruction. */ +$_def_dcbzl + +/* Define this to any prefered value from 386 up to infinity with step 100 */ +#define __CPU__ $iproc + /* Dynamic a/v plugins */ $_def_dynamic_plugins +/* Define this to compile stream-caching support, it can be enabled via + -cache */ +$_def_stream_cache + /* "restrict" keyword */ $_def_restrict_keyword @@ -8079,20 +8123,89 @@ $_def_builtin_expect # define attribute_used #endif -/* extern symbol prefix */ -$_def_extern_prefix - /* compiler support for named assembler arguments */ $_def_named_asm_args +/* assembler handling of .align */ +$_def_asmalign_pot + +/* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/ +$_def_fastmemcpy + +/* Define this if your system has the "malloc.h" header file */ +$_def_malloc + +/* memalign is mapped to malloc if unsupported */ +$_def_memalign +$_def_map_memalign +$_def_memalign_hack + +/* Define this if your system has the "alloca.h" header file */ +$_def_alloca + +/* Define this if your system has the "byteswap.h" header file */ +$_def_byteswap_h + +/* Define this if your system has the "sys/mman.h" header file */ +$_def_mman +$_def_mman_has_map_failed + +/* Define this if your system has the header file for the OSS sound interface */ +$_def_sys_soundcard + +/* Define this if your system has the header file for the OSS sound interface + * in /usr/include */ +$_def_soundcard + +/* Define this if your system has the sysinfo header */ +$_def_sys_sysinfo + +/* do we have gethostbyname2? */ +$_def_gethostbyname2 + +/* Define this if your system has swab */ +$_def_swab + +/* Define this if your system has posix select */ +$_def_posix_select + +/* Define this if your system has gettimeofday */ +$_def_gettimeofday + +/* Define this if your system has glob */ +$_def_glob + +/* Define this if your system has setenv */ +$_def_setenv +#ifndef HAVE_SETENV +int setenv(const char *name, const char *val, int overwrite); +#endif + +/* Define this if your system has strsep */ +$_def_strsep + +/* Define this if your system has vsscanf */ +$_def_vsscanf + +/* Define this if your system has sysi86 */ +$_def_sysi86 +$_def_sysi86_iv + +/* Define this if your system has pthreads */ +$_def_pthreads + +/* Toggles debugging informations */ +$_def_debug + /* enable/disable SIGHANDLER */ $_def_sighandler /* enable/disable automatic gdb attach on crash, requires SIGHANDLER */ $_def_crash_debug -/* Toggles debugging informations */ -$_def_debug +/* enables / disables cdparanoia support */ +$_def_cdparanoia +$_def_cddb /* Indicates that libcdio is available for VCD and CD-DA playback */ $_def_libcdio @@ -8116,14 +8229,37 @@ $_def_dvd_darwin $_def_sol_scsi_h $_def_hpux_scsi_h -/* Common data directory (for fonts, etc) */ -#define MPLAYER_DATADIR "$_datadir" -#define MPLAYER_CONFDIR "$_confdir" -#define MPLAYER_LIBDIR "$_libdir" +/* DVD navigation support using libdvdnav */ +$_def_dvdnav + +$_def_vcd + +#ifdef sun +#define DEFAULT_CDROM_DEVICE "/vol/dev/aliases/cdrom0" +#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE +#elif defined(WIN32) || defined(__OS2__) +#define DEFAULT_CDROM_DEVICE "D:" +#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE +#elif defined(__APPLE__) || defined(__DARWIN__) +#define DEFAULT_CDROM_DEVICE "/dev/disk1" +#define DEFAULT_DVD_DEVICE "/dev/rdiskN" +#elif defined(__OpenBSD__) +#define DEFAULT_CDROM_DEVICE "/dev/rcd0a" +#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#define DEFAULT_CDROM_DEVICE "/dev/acd0" +#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE +#elif defined(__DragonFly__) +#define DEFAULT_CDROM_DEVICE "/dev/cd0" +#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE +#elif defined(__AMIGAOS4__) +#define DEFAULT_CDROM_DEVICE "a1ide.device:2" +#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE +#else +#define DEFAULT_CDROM_DEVICE "/dev/cdrom" +#define DEFAULT_DVD_DEVICE "/dev/dvd" +#endif -/* Define this to compile stream-caching support, it can be enabled via - -cache */ -$_def_stream_cache /* Define if you are using Xvid library */ $_def_xvid @@ -8143,11 +8279,6 @@ $_def_mp3lame $_def_mp3lame_preset $_def_mp3lame_preset_medium -/* Undefine this if your sound card driver has no working select(). - If you have kernel Oops, player hangups, or just no audio, you should - try to recompile MPlayer with this option disabled! */ -$_def_select - /* define this to use iconv(3) function to codepage conversions */ $_def_iconv @@ -8157,36 +8288,10 @@ $_def_langinfo /* define this to use RTC (/dev/rtc) for video timers */ $_def_rtc -/* Define this if your system has the header file for the OSS sound interface */ -$_def_sys_soundcard - -/* Define this if your system has the header file for the OSS sound interface - * in /usr/include */ -$_def_soundcard - -/* Define this if your system has the sysinfo header */ -$_def_sys_sysinfo - -/* Define this if your system has the "malloc.h" header file */ -$_def_malloc - -/* memalign is mapped to malloc if unsupported */ -$_def_memalign -$_def_map_memalign -$_def_memalign_hack - -/* assembler handling of .align */ -$_def_asmalign_pot - -/* Define this if your system has the "alloca.h" header file */ -$_def_alloca - -/* Define this if your system has the "byteswap.h" header file */ -$_def_byteswap_h - -/* Define this if your system has the "sys/mman.h" header file */ -$_def_mman -$_def_mman_has_map_failed +/* Undefine this if your sound card driver has no working select(). + If you have kernel Oops, player hangups, or just no audio, you should + try to recompile MPlayer with this option disabled! */ +$_def_select /* Define this if you have the elf dynamic linker -ldl library */ $_def_dl @@ -8197,43 +8302,15 @@ $_def_kstat /* Define this if you have zlib */ $_def_zlib -/* Define this if you have shm support */ -$_def_shm - -/* Define this if your system has strsep */ -$_def_strsep - -/* Define this if your system has vsscanf */ -$_def_vsscanf - -/* Define this if your system has swab */ -$_def_swab - -/* Define this if your system has posix select */ -$_def_posix_select - -/* Define this if your system has gettimeofday */ -$_def_gettimeofday - -/* Define this if your system has glob */ -$_def_glob - -/* Define this if your system has setenv */ -$_def_setenv -#ifndef HAVE_SETENV -int setenv(const char *name, const char *val, int overwrite); -#endif - -/* Define this if your system has sysi86 */ -$_def_sysi86 -$_def_sysi86_iv - -/* Define this if your system has pthreads */ -$_def_pthreads - /* LIRC (remote control, see www.lirc.org) support: */ $_def_lirc +/* + * LIRCCD (LIRC client daemon) + * See http://www.dolda2000.cjb.net/~fredrik/lirccd/ + */ +$_def_lircc + /* Apple Remote (remote control, see http://docs.info.apple.com/article.html?artnum=302504) support: */ $_def_apple_remote @@ -8243,19 +8320,6 @@ $_def_apple_ir /* Support for maemo (http://www.maemo.org) */ $_def_maemo -/* - * LIRCCD (LIRC client daemon) - * See http://www.dolda2000.cjb.net/~fredrik/lirccd/ - */ -$_def_lircc - -/* DVD navigation support using libdvdnav */ -$_def_dvdnav - -/* Win32 DLL support */ -$_def_win32dll -#define WIN32_PATH "$_win32codecsdir" - /* Mac OS X specific features */ $_def_macosx_finder $_def_macosx_bundle @@ -8264,9 +8328,6 @@ $_def_corevideo $_def_quartz $_def_quicktime -/* Win32-loader support */ -$_def_win32_loader - /* Use codec libs included in mplayer CVS / source dist: */ $_def_mp3lib @@ -8280,6 +8341,42 @@ $_def_libmpeg2 /* maximum alignment used by libmpeg2 */ #define ATTRIBUTE_ALIGNED_MAX 16 +/* liblzo support */ +$_def_liblzo + +/* libmad support */ +$_def_mad + +/* enable OggVorbis support */ +$_def_vorbis +$_def_tremor + +/* enable Speex support */ +$_def_speex + +/* enable musepack support */ +$_def_musepack + +/* enable OggTheora support */ +$_def_theora + +/* enable FAAD (AAC) support */ +$_def_faad +$_def_faad_internal + +/* enable FAAC (AAC encoder) support */ +$_def_faac + +/* enable libdca support */ +$_def_libdca + +/* Win32 DLL support */ +$_def_win32dll +#define WIN32_PATH "$_win32codecsdir" + +/* Win32-loader support */ +$_def_win32_loader + /* XAnim DLL support */ $_def_xanim /* Default search path */ @@ -8290,15 +8387,16 @@ $_def_real /* Default search path */ $_def_real_path +/* enables / disables QTX codecs */ +$_def_qtx +$_def_qtx_win32 + /* LIVE555 Streaming Media library support */ $_def_live /* libnemesi Streaming Media library support */ $_def_nemesi -/* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/ -$_def_fastmemcpy - /* Use UnRAR executable for Vobsubs */ $_def_unrar_exec @@ -8371,72 +8469,9 @@ $_def_radio_bsdbt848 /* Enable Video 4 Linux 2 MPEG PVR support */ $_def_pvr -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -$_def_words_endian - -/* Define if your processor can access unaligned data in a fast way */ -$_def_fast_unaligned - -`ff_config_enable "$_arch_all" "$_arch" "ARCH"` - -/* For the PPC. G5 has the dcbzl when in 64bit mode but G4s and earlier do not - have the instruction. */ -$_def_dcbzl - /* Define this for Cygwin build for win32 */ $_def_confwin32 -/* Define this to any prefered value from 386 up to infinity with step 100 */ -#define __CPU__ $iproc - -$_def_vcd - -#ifdef sun -#define DEFAULT_CDROM_DEVICE "/vol/dev/aliases/cdrom0" -#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE -#elif defined(WIN32) || defined(__OS2__) -#define DEFAULT_CDROM_DEVICE "D:" -#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE -#elif defined(__APPLE__) || defined(__DARWIN__) -#define DEFAULT_CDROM_DEVICE "/dev/disk1" -#define DEFAULT_DVD_DEVICE "/dev/rdiskN" -#elif defined(__OpenBSD__) -#define DEFAULT_CDROM_DEVICE "/dev/rcd0a" -#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -#define DEFAULT_CDROM_DEVICE "/dev/acd0" -#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE -#elif defined(__DragonFly__) -#define DEFAULT_CDROM_DEVICE "/dev/cd0" -#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE -#elif defined(__AMIGAOS4__) -#define DEFAULT_CDROM_DEVICE "a1ide.device:2" -#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE -#else -#define DEFAULT_CDROM_DEVICE "/dev/cdrom" -#define DEFAULT_DVD_DEVICE "/dev/dvd" -#endif - - -/*---------------------------------------------------------------------------- -** -** NOTE: Instead of modifying these definitions here, use the -** --enable/--disable options of the ./configure script! -** See ./configure --help for details. -** -*---------------------------------------------------------------------------*/ - -/* C99 *lrint* and round* functions available */ -$_def_llrint -$_def_lrint -$_def_lrintf -$_def_round -$_def_roundf - -/* nanosleep support */ -$_def_nanosleep - /* SMB support */ $_def_smb @@ -8486,34 +8521,11 @@ $_def_fribidi /* enable ENCA usage */ $_def_enca -/* liblzo support */ -$_def_liblzo - -/* libmad support */ -$_def_mad - -/* enable OggVorbis support */ -$_def_vorbis -$_def_tremor - -/* enable Speex support */ -$_def_speex - -/* enable musepack support */ -$_def_musepack - -/* enable OggTheora support */ -$_def_theora - -/* enable FAAD (AAC) support */ -$_def_faad -$_def_faad_internal - -/* enable FAAC (AAC encoder) support */ -$_def_faac +/* enables / disables osd menu */ +$_def_menu -/* enable libdca support */ -$_def_libdca +/* enables / disables subtitles sorting */ +$_def_sortsub /* enable LADSPA plugin support */ $_def_ladspa @@ -8543,9 +8555,8 @@ typedef int socklen_t; /* closesocket() support */ $_def_closesocket -/* enables / disables cdparanoia support */ -$_def_cdparanoia -$_def_cddb +/* enables inet6 support */ +$_def_inet6 /* enables / disables VIDIX usage */ $_def_vidix @@ -8567,32 +8578,10 @@ $_def_vidix_pfx /* enables / disables new input joystick support */ $_def_joystick -/* enables / disables QTX codecs */ -$_def_qtx -$_def_qtx_win32 - -/* enables / disables osd menu */ -$_def_menu - -/* enables / disables subtitles sorting */ -$_def_sortsub - /* XMMS input plugin support */ $_def_xmms #define XMMS_INPUT_PLUGIN_DIR "$_xmmsplugindir" -/* enables inet6 support */ -$_def_inet6 - -/* do we have gethostbyname2? */ -$_def_gethostbyname2 - -/* Extension defines */ -`ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE"` - -/* altivec.h support */ -$_def_altivec_h - /* libvo options */ #define SCREEN_SIZE_X 1 #define SCREEN_SIZE_Y 1 @@ -8644,6 +8633,9 @@ $_def_tga $_def_toolame $_def_twolame +/* Define this if you have shm support */ +$_def_shm + /* used by GUI: */ $_def_xshape @@ -8721,6 +8713,9 @@ $_def_xvid_lavc /* mkstemp support */ $_def_mkstemp +/* extern symbol prefix */ +$_def_extern_prefix + /* Use specific parts from FFmpeg. */ `ff_config_enable "$_libavdecoders_all" "$_libavdecoders"` `ff_config_enable "$_libavencoders_all" "$_libavencoders"` -- cgit v1.2.3 From 68fa9667ecdc0c23aaa8b346930aeca983045df2 Mon Sep 17 00:00:00 2001 From: ranma Date: Sat, 4 Oct 2008 15:03:10 +0000 Subject: Make alsa resume after suspend to disk (would say 'file descriptor is in bad state' before this change) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27712 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_alsa.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 987713e6f9..e5372390f8 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -765,6 +765,10 @@ static void audio_resume(void) { int err; + if (snd_pcm_state(alsa_handler) == SND_PCM_STATE_SUSPENDED) { + mp_msg(MSGT_AO,MSGL_INFO,MSGTR_AO_ALSA_PcmInSuspendModeTryingResume); + while ((err = snd_pcm_resume(alsa_handler)) == -EAGAIN) sleep(1); + } if (alsa_can_pause) { if ((err = snd_pcm_pause(alsa_handler, 0)) < 0) { -- cgit v1.2.3 From d68f29e5939368f5c2cffe2dd77d4d0bae950c92 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 15:06:50 +0000 Subject: Add a comment to lonely 'fi' for clarification. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27713 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4ff899c568..6b93d69a33 100755 --- a/configure +++ b/configure @@ -6894,7 +6894,7 @@ fi _res_comment="in libavcodec: $_mp3lame_lavc" echores "$_mp3lame" -fi +fi # test "$_mencoder" != no echocheck "mencoder" if test "$_mencoder" = yes ; then -- cgit v1.2.3 From cb8c70d6c2ee1a9aa6465719854175f4ede514fd Mon Sep 17 00:00:00 2001 From: ranma Date: Sat, 4 Oct 2008 15:11:39 +0000 Subject: Fix "format '%d' expects type 'int', but argument 6 has type 'size_t'" warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27714 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_alsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index e5372390f8..4cb4470271 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -707,7 +707,7 @@ static int init(int rate_hz, int channels, int format, int flags) /* end setting sw-params */ mp_msg(MSGT_AO,MSGL_V,"alsa: %d Hz/%d channels/%d bpf/%d bytes buffer/%s\n", - ao_data.samplerate, ao_data.channels, bytes_per_sample, ao_data.buffersize, + ao_data.samplerate, ao_data.channels, (int)bytes_per_sample, ao_data.buffersize, snd_pcm_format_description(alsa_format)); } // end switch alsa_handler (spdif) -- cgit v1.2.3 From 15d516ffdf8e0f4dde6f15b9f03767fb17636a03 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 4 Oct 2008 16:40:35 +0000 Subject: Remove g6Dither from libswscale. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27715 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 1 - libswscale/swscale_template.c | 18 ++++++++++-------- libswscale/yuv2rgb.c | 1 - libswscale/yuv2rgb_template.c | 6 ++---- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index ff2d1d49d4..882af25f61 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -207,7 +207,6 @@ DECLARE_ASM_CONST(8, uint64_t, bm01010101)=0x00FF00FF00FF00FFLL; static volatile uint64_t attribute_used __attribute__((aligned(8))) b5Dither; static volatile uint64_t attribute_used __attribute__((aligned(8))) g5Dither; -static volatile uint64_t attribute_used __attribute__((aligned(8))) g6Dither; static volatile uint64_t attribute_used __attribute__((aligned(8))) r5Dither; const DECLARE_ALIGNED(8, uint64_t, ff_dither4[2]) = { diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 74f4c57285..e960c7dad3 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -1105,7 +1105,7 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_ /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2\n\t" - "paddusb "MANGLE(g6Dither)", %%mm4\n\t" + "paddusb "MANGLE(g5Dither)", %%mm4\n\t" "paddusb "MANGLE(r5Dither)", %%mm5\n\t" #endif @@ -1165,7 +1165,7 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_ /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2 \n\t" - "paddusb "MANGLE(g6Dither)", %%mm4 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm4 \n\t" "paddusb "MANGLE(r5Dither)", %%mm5 \n\t" #endif @@ -1330,7 +1330,7 @@ FULL_YSCALEYUV2RGB FULL_YSCALEYUV2RGB #ifdef DITHER1XBPP - "paddusb "MANGLE(g6Dither)", %%mm1 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm1 \n\t" "paddusb "MANGLE(r5Dither)", %%mm0 \n\t" "paddusb "MANGLE(b5Dither)", %%mm3 \n\t" #endif @@ -1490,7 +1490,7 @@ FULL_YSCALEYUV2RGB /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2 \n\t" - "paddusb "MANGLE(g6Dither)", %%mm4 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm4 \n\t" "paddusb "MANGLE(r5Dither)", %%mm5 \n\t" #endif @@ -1602,7 +1602,7 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t * /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2 \n\t" - "paddusb "MANGLE(g6Dither)", %%mm4 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm4 \n\t" "paddusb "MANGLE(r5Dither)", %%mm5 \n\t" #endif @@ -1691,7 +1691,7 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t * /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2 \n\t" - "paddusb "MANGLE(g6Dither)", %%mm4 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm4 \n\t" "paddusb "MANGLE(r5Dither)", %%mm5 \n\t" #endif @@ -3092,8 +3092,10 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s #ifdef HAVE_MMX b5Dither= ff_dither8[dstY&1]; - g6Dither= ff_dither4[dstY&1]; - g5Dither= ff_dither8[dstY&1]; + if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555) + g5Dither= ff_dither8[dstY&1]; + else + g5Dither= ff_dither4[dstY&1]; r5Dither= ff_dither8[(dstY+1)&1]; #endif if (dstY < dstH-2) diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 544d608d62..1f84d1df04 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -58,7 +58,6 @@ DECLARE_ASM_CONST(8, uint64_t, mmx_grnmask) = 0xfcfcfcfcfcfcfcfcULL; // not knowing that these are read in the ASM block. static volatile uint64_t attribute_used __attribute__((aligned(8))) b5Dither; static volatile uint64_t attribute_used __attribute__((aligned(8))) g5Dither; -static volatile uint64_t attribute_used __attribute__((aligned(8))) g6Dither; static volatile uint64_t attribute_used __attribute__((aligned(8))) r5Dither; #undef HAVE_MMX diff --git a/libswscale/yuv2rgb_template.c b/libswscale/yuv2rgb_template.c index 1f8e225baa..7a45870ba5 100644 --- a/libswscale/yuv2rgb_template.c +++ b/libswscale/yuv2rgb_template.c @@ -144,8 +144,7 @@ static inline int RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* src[], int srcStr long index= -h_size/2; b5Dither= ff_dither8[y&1]; - g6Dither= ff_dither4[y&1]; - g5Dither= ff_dither8[y&1]; + g5Dither= ff_dither4[y&1]; r5Dither= ff_dither8[(y+1)&1]; /* This MMX assembly code deals with a SINGLE scan line at a time, * it converts 8 pixels in each iteration. */ @@ -166,7 +165,7 @@ YUV2RGB #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm0;" - "paddusb "MANGLE(g6Dither)", %%mm2;" + "paddusb "MANGLE(g5Dither)", %%mm2;" "paddusb "MANGLE(r5Dither)", %%mm1;" #endif /* mask unneeded bits off */ @@ -239,7 +238,6 @@ static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* src[], int srcStr long index= -h_size/2; b5Dither= ff_dither8[y&1]; - g6Dither= ff_dither4[y&1]; g5Dither= ff_dither8[y&1]; r5Dither= ff_dither8[(y+1)&1]; /* This MMX assembly code deals with a SINGLE scan line at a time, -- cgit v1.2.3 From 036b3d0c5171e211ed3aa5f29973bde4268b603c Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 17:15:39 +0000 Subject: Merge variable declaration and export. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27716 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 6b93d69a33..0dfa2ac3ae 100755 --- a/configure +++ b/configure @@ -50,8 +50,7 @@ ############################################################################# # Prevent locale nonsense from breaking basic text processing utils -LC_ALL=C -export LC_ALL +export LC_ALL=C # Store the configure line that was used _configuration="$*" -- cgit v1.2.3 From 6fb9d58116938f5d869f40d6ffc62cf4ef7227f0 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Oct 2008 17:55:42 +0000 Subject: Revert the removal of the likely/unlikely macros, they are still used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27717 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0dfa2ac3ae..fccf0840d6 100755 --- a/configure +++ b/configure @@ -8112,8 +8112,15 @@ $_def_stream_cache /* "restrict" keyword */ $_def_restrict_keyword -/* __builtin_expect branch prediction hint, libmpeg2 + FFmpeg */ +/* __builtin_expect branch prediction hint */ $_def_builtin_expect +#ifdef HAVE_BUILTIN_EXPECT +#define likely(x) __builtin_expect ((x) != 0, 1) +#define unlikely(x) __builtin_expect ((x) != 0, 0) +#else +#define likely(x) (x) +#define unlikely(x) (x) +#endif /* attribute(used) as needed by some compilers */ #if (__GNUC__ * 100 + __GNUC_MINOR__ >= 300) -- cgit v1.2.3 From 99877b2fc6bfa4fe451dee60fbeca3baac6c24e3 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 4 Oct 2008 18:50:39 +0000 Subject: Remove b5Dither, g5Dither and r5Dither from libswscale. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27718 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 4 --- libswscale/swscale_template.c | 68 +++++++++++++++++++++---------------------- libswscale/yuv2rgb.c | 6 ---- libswscale/yuv2rgb_template.c | 28 +++++++++--------- 4 files changed, 48 insertions(+), 58 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 882af25f61..639de3bb17 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -205,10 +205,6 @@ DECLARE_ASM_CONST(8, uint64_t, bm00000111)=0x0000000000FFFFFFLL; DECLARE_ASM_CONST(8, uint64_t, bm11111000)=0xFFFFFFFFFF000000LL; DECLARE_ASM_CONST(8, uint64_t, bm01010101)=0x00FF00FF00FF00FFLL; -static volatile uint64_t attribute_used __attribute__((aligned(8))) b5Dither; -static volatile uint64_t attribute_used __attribute__((aligned(8))) g5Dither; -static volatile uint64_t attribute_used __attribute__((aligned(8))) r5Dither; - const DECLARE_ALIGNED(8, uint64_t, ff_dither4[2]) = { 0x0103010301030103LL, 0x0200020002000200LL,}; diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index e960c7dad3..e96263b6b6 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -1091,9 +1091,9 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_ YSCALEYUV2RGBX /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP - "paddusb "MANGLE(b5Dither)", %%mm2\n\t" - "paddusb "MANGLE(g5Dither)", %%mm4\n\t" - "paddusb "MANGLE(r5Dither)", %%mm5\n\t" + "paddusb "BLUE_DITHER"(%0), %%mm2\n\t" + "paddusb "GREEN_DITHER"(%0), %%mm4\n\t" + "paddusb "RED_DITHER"(%0), %%mm5\n\t" #endif WRITERGB15(%4, %5, %%REGa) @@ -1104,9 +1104,9 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_ YSCALEYUV2RGBX