Commit Graph

2887 Commits

Author SHA1 Message Date
diego dc440b47d3 Make ff_config_enable work with lowercase values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30920 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:34:33 +00:00
diego f3928b9464 Split subarch handling off from generic arch handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30919 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:20:06 +00:00
cehoyos 8e8387f7bd Fix compilation after FFmpeg r22569 at least for some architectures.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30916 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 10:46:18 +00:00
diego 43ccbad38c cosmetics: Drop leading underscores from arch variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30915 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 10:10:47 +00:00
cehoyos 151e9a8303 Fix compilation after FFmpeg r22565.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30905 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 10:25:54 +00:00
diego 2c2097601e Add CONFIG_DCT and CONFIG_DWT to config.h as well as to config.mak for FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30896 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 06:39:21 +00:00
diego ee2ac03ccc variable renaming cosmetics: _have_yasm --> have_yasm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30894 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 23:39:02 +00:00
diego 7d51464c27 Remove unused MMX_FFT Makefile variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30893 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 23:37:58 +00:00
diego 3aee1115a8 cosmetics: Simplify _codecsdir setting for MinGW and OS/2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30892 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 23:00:06 +00:00
diego 0dd44a006e Add -Wstrict-prototypes to CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30891 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 22:58:20 +00:00
diego 70fafd7803 Use menu instead of GUI as example for an internal feature turned on by a flag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30890 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 22:55:13 +00:00
cehoyos 299f7ad933 Fix compilation after FFmpeg r22522.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30889 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 22:50:15 +00:00
diego aee9749bca Replace separate Win32, XAnim and Real codec directories by one global dir.
Nowadays MPlayer does not use the codecs from other installed programs.
A runtime setting will soon take over the rare case that binary codecs
should be searched for in non-standard directories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30888 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 16:13:32 +00:00
Uoti Urpala 00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala 0269d22d32 Merge svn changes up to r30876 2010-03-10 03:18:42 +02:00
Uoti Urpala 240550bbb9 Merge svn changes up to r30848 2010-03-10 03:00:14 +02:00
Uoti Urpala acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
Uoti Urpala e03e0597d0 Merge svn changes up to r30570 2010-03-09 23:20:56 +02:00
Uoti Urpala 36e7a20e69 Merge svn changes up to r30550 2010-03-09 23:03:14 +02:00
Uoti Urpala f1b6cdbe9d Merge svn changes up to r30484 2010-03-09 19:24:47 +02:00
cehoyos 27aa3db23e Fix help text for --disable-win32dll.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30871 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 12:01:42 +00:00
Uoti Urpala 81065d41b6 Add runtime translation support
Add support for gettext-based runtime translations. Enabled with
configure switch --enable-translation (no autodetection). Note that no
translation files are installed yet.
2010-03-08 22:53:12 +02:00
komh b10a6917f4 Define HAVE_SETMODE conditionally, and use it in stream/stream_file.c instead
of platform specific predefined macros.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30829 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 14:46:44 +00:00
komh 9beeeb1a9e Add a VCD support for OS/2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30819 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 14:32:29 +00:00
diego c106fe7751 Drop support for old-style DVB code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-02 19:57:17 +00:00
rectalogic d83eddc2a8 Remove RTSP_MUXER from libavmuxers to fix compilation with --disable-network
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30817 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-02 17:18:55 +00:00
diego e27159e748 Add CONFIG_LSP to config.h for libavcodec compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30816 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-02 16:29:21 +00:00
Uoti Urpala 74ffb51f33 build/vdpau: drop support for dynamic loading of libvdpau
After a recent library update on my system MPlayer started crashing on
exit in XCloseDisplay() if -vo vdpau had been used. With normal
linking it works OK. Since there should be little need for the dynamic
loading functionality any more, I'll just drop it rather than try
investigating the exact problem with dynamic loading and whether it
would be fixable. VDPAU is now linked normally with -lvdpau if
available.
2010-02-26 18:37:19 +02:00
diego dc33991b88 Add -Wmissing-prototypes to CFLAGS if available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30719 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-23 07:55:47 +00:00
diego c6ef2fce44 FFmpeg: Add HAVE_ALIGNED_{8,16} to config.h on ppc and x86.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30665 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 17:21:48 +00:00
diego 5f10e16f75 FFmpeg: Add tomi to architecture list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30664 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 17:03:28 +00:00
reimar d58a991207 Add av_alias define as a hack to fix compilation of intreadwrite.h without
HAVE_AV_CONFIG_H.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30644 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 21:48:49 +00:00
reimar 2347661b0e Check that fontconfig version is at least 2.4.2, which is required for the
included libass.
A more fine-grained check would be possible to e.g. allow older versions
if internal libass is disabled, but seems like overkill.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30570 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 11:57:37 +00:00
diego 134e9685a2 10l: Revert previous commit about CONFIG_HARDCODED_TABLES/CONFIG_MPEGAUDIO_HP.
These two variables are handled different from others in libavcodec/Makefile,
thus the previous way of adding them to config.mak was correct.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30553 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-13 16:59:42 +00:00
diego 24959bb3b4 Use normal way to add CONFIG_HARDCODED_TABLES/CONFIG_MPEGAUDIO_HP to config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30552 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-13 15:51:03 +00:00
diego 23a00e3486 Move def_hardcoded_tables to the FFmpeg section of config.h, where it belongs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30551 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-13 15:47:55 +00:00
diego 93abb4f092 Fix shared library libavutil check: test for av_clip instead of av_gcd.
av_gcd is not available in the header #included in the check.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30550 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-13 15:46:33 +00:00
komh 47f78d28f1 Add win32 loader support for OS/2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30541 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-12 01:38:14 +00:00
diego 19f5552dd1 Move one more FFmpeg-related definition to the FFmpeg section of config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30537 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-11 10:56:09 +00:00
diego 13db72bd96 Move some FFmpeg-related definitions to the FFmpeg section of config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30536 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-11 10:52:36 +00:00
diego 90161292d9 Move def_dos_paths to a better place within config.h; not just FFmpeg uses it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30535 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-11 08:52:15 +00:00
reimar 0b6de5c37e Enable RTSP and SDP demuxers if network support is enabled, they can now be used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30505 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 21:17:46 +00:00
komh 2acf3242cd Checks ipv6_mreq/sockaddr_in6/sockaddr_sa_len for FFmpeg
instead of defining macros unconditionally.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30495 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-03 13:14:09 +00:00
reimar b336a261bf Revert r30324 which broken the struct addrinfo check by making it always pass.
Instead fix the MinGW64 issue properly by including ws2tcpip.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30486 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 18:57:43 +00:00
komh f275d3d32c Add OS/2 KAI audio driver support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-01 14:09:53 +00:00
reimar 2778dca1b4 Disable FFmpeg's network protocols if --disable-network was specified.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30479 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-31 15:11:16 +00:00
cehoyos 036a297ef1 Fix compilation for new Bink audio decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30478 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-31 14:14:20 +00:00
diego 3219d1c862 Add some more definitions for FFmpeg to config.h:
HAVE_ATTRIBUTE_MAY_ALIAS
HAVE_STRUCT_IPV6_MREQ
HAVE_STRUCT_SOCKADDR_IN6


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30464 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 21:17:38 +00:00
Uoti Urpala 4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
Uoti Urpala ff2df2ac54 Merge svn changes up to r30322 2010-01-25 15:17:50 +02:00
Uoti Urpala 69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
Uoti Urpala 0f72485ee7 Merge svn changes up to r30264
Conflicts:
	gui/wm/ws.c
2010-01-25 14:52:29 +02:00
diego 937c4fab19 Disable all hwaccel glue code from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30384 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-21 11:16:03 +00:00
cehoyos 34db438211 x264 version 0.83 is required.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30383 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-21 10:37:35 +00:00
cehoyos 4e92beb4ea Fix compilation after FFmpeg r21353.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30382 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-21 10:31:34 +00:00
diego 2c6df2c120 Create libavutil/avconfig.h, required for FFmpeg compilation.
based on a patch by Etienne Buira, etienne.buira free fr


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30376 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 18:53:16 +00:00
zuxy 37fd4d44bd Set HAVE_FAST_CLZ according to CPU type.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30372 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 13:35:57 +00:00
zuxy 3b949d7bdf Support for detection of AMD Phenom.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30363 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-18 03:06:43 +00:00
reimar 535803c310 Set ASFLAGS and HAVE_VFP_ARGS needed to compile for ARM with VFP/NEON support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30345 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 12:27:54 +00:00
reimar 28aa29222e Also try linking against dxguid for SDL test.
Some broken SDL versions need it even though sdl-config does include it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30344 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 11:49:33 +00:00
reimar 452993b4eb Allow anything starting with "arm" to be used as --target for ARM CPUs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30339 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 23:22:43 +00:00
reimar f65ce5d163 Manually add --nxcompat --no-seh --dynamicbase to linker flags if available,
works around binutils' policy of making exploits as easy as possible by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30325 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 16:39:46 +00:00
reimar cd2dbe5939 Fix struct addrinfo check, its definition might not allow actually allocating it.
Fixes MinGW64 compilation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30324 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 16:22:57 +00:00
reimar a12d96e87e Fix sockaddr_storage check to work with winsock/MinGW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30323 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 16:16:50 +00:00
reimar 5f5462c0ec Add HAVE_FAST_CLZ define and set it to 0 to keep the status quo for now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30322 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 15:21:36 +00:00
reimar b18ddf9807 HAVE_INLINE_ASM for FFmpeg should be one since we only support
compilers that can do inline asm.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30321 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 15:20:26 +00:00
zuxy 7231e76268 Set _optimizing for x86-64.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30310 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 09:47:45 +00:00
zuxy 0fd68f17ca The undocumented x86-64 is a better fallback for core2 than nocona.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30309 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 09:33:38 +00:00
zuxy 02531411b3 Add -fno-common to avoid misalignment for global var under win32 like what
has been done for ffmpeg.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30308 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 09:31:15 +00:00
zuxy 956f0444ae Set HAVE_FAST_CMOV to 0 for NetBurst based x86-64 processors, e.g. Prescott.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30307 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 09:10:23 +00:00
zuxy 9cbb5c686f Fix typo in r30302
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30305 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 07:55:07 +00:00
cehoyos 3e2af067ec Fix compilation after recent changes in FFmpeg.
Patch by Etienne Buira, etienne D buira A free D fr


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30302 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-14 12:06:38 +00:00
reimar 59fa6f549a Add very experimetal support for the Sun C compiler.
To actually work, all "packed" attributes have to be replaced by equivalent
pragmas and make DEPS=no must be used to compile.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30296 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-12 21:16:01 +00:00
reimar 977a21bea5 Change -pipe check to avoid misdetecting it as available for Sun's compiler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30295 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-12 21:12:23 +00:00
reimar 04fde0d936 Add checks for exp2, exp2 and log2f required by FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30291 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-12 19:41:44 +00:00
reimar fe2e888fd6 Search X11 headers and libraries also in /usr/local/..., should ease
compilation on FreeBSD.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30271 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 21:47:50 +00:00
reimar 5c459408bd Do not use FreeBSD's cpuinfo file on x86_64 either, as on x86_32 it will not
report 3Dnow availability.
Patch from FreeBSD ports.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30270 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 21:22:44 +00:00
reimar 4ecd4741e6 FFmpeg uses ifdef in Makefiles for CONFIG_MPEGAUDIO_HP and CONFIG_HARDCODED_TABLES.
Change the config.mak generation to take that into account and not generate a
definition for these if the features are disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30269 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 20:32:19 +00:00
reimar 4e50b6df73 Fix OpenGL detection for OpenSolaris where -lXdamage is necessary.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30264 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 18:22:01 +00:00
reimar fff96519ee Only print "using sdl-config" if we actually used it for SDL detection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30263 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 16:00:07 +00:00
reimar 894acafa51 Prefer libdca over libdts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30259 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 13:55:55 +00:00
reimar e51a1598b4 Quote test arguments that may be empty
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30257 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 13:32:37 +00:00
reimar 71670752d0 Disable internal copy of liba52 by default, libavcodec should be an
adequate replacement.
If there are no complaints we should probably remove it within a few months.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30256 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 12:13:10 +00:00
reimar 7712ce86d8 IPv6 in FFmpeg is not supported for MinGW, so do not set CONFIG_IPV6 for that case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30255 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 18:29:28 +00:00
reimar 43d4fedf59 Add several make variables to make --enable-hardcoded-tables actually compile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30252 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 14:17:23 +00:00
reimar 13b9a20821 Add support for --enable-hardcoded-tables like FFmpeg has.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30251 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 13:39:26 +00:00
greg 83da389dce libass needs at least freetype 2.2.1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30244 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-08 18:56:39 +00:00
Uoti Urpala 819b8f08a2 Merge svn changes up to r30236 2010-01-08 02:44:37 +02:00
Uoti Urpala d1f0cbe5c8 Merge svn r30200 (reindent configure) 2010-01-08 02:34:05 +02:00
Uoti Urpala 82780406d1 Merge svn changes up to r30199 2010-01-08 02:08:51 +02:00
Uoti Urpala 17eb7f2c4b Merge svn changes up to r30195 2010-01-08 02:06:42 +02:00
Uoti Urpala ba21aba40d Merge svn changes up to r30187 2010-01-08 01:55:15 +02:00
Uoti Urpala b390b9b28f Merge svn changes up to r30185 2010-01-08 01:36:05 +02:00
Uoti Urpala d157b2a8ce Merge svn changes up to r30173 2010-01-08 01:17:56 +02:00
diego f80ece49a8 Move MatrixView video output check below OpenGL check, it depends on OpenGL.
patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30226 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-05 10:54:41 +00:00
diego c202adb9f4 Remove pointless variable declaration from DirectFB check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30223 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 22:32:28 +00:00
diego e4ce50305b Add missing stdlib.h #include to fribidi check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30222 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 22:30:41 +00:00
diego 22298a8e57 Remove pointless printf call in libmp3lame test.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30221 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 22:29:55 +00:00
diego ff44ac1a3c Pass proper parameters to dlopen/dlsym/vsscanf to avoid configure test warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30220 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 22:28:44 +00:00
diego 09b8d9402f Pass a proper va_list type to vsscanf() test in configure.
This fixes the check on SuperH with CodeSourcery compilers.
patch by Bill Traynor, wmat naoi ca


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30219 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 21:57:13 +00:00
diego da13681a21 cosmetics: tabs to spaces, some reindentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30200 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 12:24:07 +00:00
diego 0e3224805a Fix fribidi check to avoid spamming the console with error messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30199 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 12:12:57 +00:00
diego c631f7bfa3 Add a few definitions used by FFmpeg to config.h:
CONFIG_IPV6, HAVE_SETMODE, HAVE_SYS_SELECT_H


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30196 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 11:13:49 +00:00
reimar f31ed10742 Modify -vo direct3d so we do not have to link against d3d9.dll, it might
not be available on some rare systems.
Based on patch used for builds by Gianluigi Tiesi [sherpya netfarm it]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30190 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 17:00:51 +00:00
reimar 9e7e04add6 Enable all FFmpeg protocols by default, they seem to build without issue
on Linux and MinGW, lets see if it works for everything else as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30188 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:46:31 +00:00
reimar eff2254d58 Change vo_png to use FFmpeg's png encoder instead of libpng.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30186 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:26:30 +00:00
reimar a7be2e180b Finally add matrixview vo.
Heavily cleaned up/fixed etc. by me, improvements are still possible though.
Patch originally by Pigeon <pigeon at pigeond.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:54:51 +00:00
reimar c23a01e260 Fixup SDL configure check:
- Make it work without sdl-config which adds at least useless or even hurtful
  cflags and also does not work for cross-compiling
- If using sdl-config, make it use the CFLAGS we actually use for compiling
  instead of something else. Thus #undef main is needed in the test program.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 11:33:33 +00:00
reimar 4a981bf09a Also detect fontconfig when it requires -liconv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30176 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 09:11:20 +00:00
reimar ec0c6d2a91 Change fribidi check to also work without fribidi-config.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30175 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 01:00:21 +00:00
reimar 2e557e3b28 Add support for JPEG2000 via FFmpeg/OpenJPEG
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:58:56 +00:00
reimar f4f37e555a Fix typo in code disabling VIDIX on mingw64
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30168 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 16:55:41 +00:00
reimar bb99b3f640 Disable vidix on 64 bit MinGW compiles, it seems to fail compiling and
certainly was never tested.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30167 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 16:47:26 +00:00
reimar c1d166be18 Fix compilation if FreeType is not available, in particular do not try to build
libass and use the internal ass.h as a stub for structs needed for EOSD.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 18:51:59 +00:00
Uoti Urpala dc7f183022 Merge svn changes up to r30104
Ignore the broken correct-pts change in r30100.
2009-12-30 00:14:20 +02:00
Uoti Urpala 67b40bd219 Merge svn changes up to r30065 2009-12-29 23:57:14 +02:00
Uoti Urpala 57ce95b96a audio: Remove fixed decode_audio() return size limit (MAX_OUTBURST)
A couple of months ago MPlayer's ALSA driver started rounding the
amount of input data it was willing to accept in one call down to an
integer multiple of the value it set in ao_data.outburst. In some
configurations it was possible for this value to exceed the 64 KiB
limit on the amount MPlayer was willing to write in a single call to
the AO. As a result ao_alsa accepted 0 bytes in each play() call and
audio playback failed. Fix this by removing the fixed 64 KiB limit on
the amount of audio sent to AO at once; the limit was mostly a remnant
of older code anyway.
2009-12-29 15:51:59 +02:00
diego dfe6cfd967 Allow passing variants of "mingw32" as system name to --target. This ensures
backwards compatibility after switching from "mingw32msvc" to "mingw32".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30101 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-23 10:21:53 +00:00
diego 4e18fed064 Use "mingw32" instead of "mingw32msvc" as system name for MinGW with --target.
The former is the official name used by the MinGW project.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30089 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 19:12:20 +00:00
reimar bfd01bdc17 Make ass_mp.h use the system-libass headers when the internal one is disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30068 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 15:41:47 +00:00
reimar 1f4109d85e Experimental support for external libass.
So far probably only works with the libass from Ubuntu 9.10


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30066 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 15:18:22 +00:00
reimar f97fd3eff0 Rename GL_* defines to CONFIG_GL_*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30065 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 13:49:44 +00:00
reimar 140de2a9e2 Make the check for X11 and WIN32 backends for OpenGL separate.
This fixes compilation on Windows with X11 but no GLX available.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30063 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 10:52:32 +00:00
Uoti Urpala efcc9ad712 Merge svn changes up to r30055 2009-12-18 18:54:42 +02:00
reimar e0b789ec7b Disable winsock when we already found a working socklib instead of checking
blindly for cygwin and uselessly running the check on e.g. Linux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29986 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-09 17:55:34 +00:00
lorenm 9c846b3df6 sync to x264-r1327. (only needed for x264-in-libavcodec)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29972 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-29 05:18:40 +00:00
Uoti Urpala 1dba61a670 build: Generate version numbers for git
Update the version.sh script for git so it'll generate version numbers
more useful than "UNKNOWN". At the moment it only generates the short
SHA1 name, but adding a tag as a starting point should allow more
useful output. Rather than update the Makefile logic that tried to
guess whether the svn revision had changed since the last version.h
update, just run the version.sh script from configure so the version
is updated at least at that time.
2009-11-23 06:22:15 +02:00
diego dd3bf9897d Add #defines for FFMPEG_LICENSE and FFMPEG_CONFIGURATION to config.h.
This is necessary to sync up with some recent FFmpeg changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29933 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-18 18:07:54 +00:00
reimar ef1ae8272d Complete configure support for compiling in FFmpeg's protocol support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29922 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 16:05:18 +00:00
Uoti Urpala 287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
cehoyos 153cac185c Do not dynamically load libvdpau.so.1, but link at compile time.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29903 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 22:26:38 +00:00
cehoyos 977c12c628 10l: Fix compilation without VDPAU.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29891 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 00:30:54 +00:00
reimar 42ec82c1e5 Use configure code to define PIC instead of duplicating the check in mangle.h.
While it is currently not necessary, it might be a good idea to move this outside
the x86-only block in configure, as well as adding -pie to LDFLAGS.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29877 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 13:08:36 +00:00
reimar 3cc24f5bee Remove macho64 special-case for yasm options, -DPIC is already added
by the PIC-detection code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29856 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 19:32:57 +00:00
reimar 4c3dc1b10b Remove a pointless undeclared function reference, #error is assumed
to be enough to fail cc_check all over the place already.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29855 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:41:40 +00:00
reimar e1ce8f9c41 Add a check if compiler creates PIC code and if so add -DPIC to YASMFLAGS.
Should make it possible to compile MPlayer as PIE on x86_64 e.g. on
hardened Gentoo and probably OpenBSD, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29853 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:38:59 +00:00
cehoyos 2a5611473c Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 16:40:42 +00:00
cehoyos 423c415534 Separate teletext from tv support.
Path by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:31:05 +00:00
attila 87e2b02f7a PPC: make inline asm xform address test work with Apple tools
original from mru, ffmpeg commit r20466
adapted to mplayer by Emanuele Giaquinta (exg)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29834 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 14:06:58 +00:00
reimar 9c0834b0f6 Add cast to signed for 64 bit check, since according to an FFmpeg bug report
some compilers (llvm?) do not fail when arrays larger than the maximum
addressable size are declared but instead just silently generate broken code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29826 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 19:05:42 +00:00
cehoyos a10b3f08bf Add new VDPAU feature high-quality-scaling (and require newer library).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29823 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-04 15:30:13 +00:00
diego f86cab4ecc consistency fix: Give all CONFIG_ definitions the value 1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29800 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-28 13:55:18 +00:00
reimar 406c8a2b5b Move 64 bit check below compiler detection since it needs the compiler
and obviously should use the one that will be used for compiling in the end.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29797 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-26 22:15:19 +00:00
lorenm e155d3d9f9 sync to x264-r1296
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29787 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-19 21:23:08 +00:00
Uoti Urpala 4a35807e72 build: Support x264 version 78 2009-10-19 23:54:36 +03:00
diego fc1b468117 Get rid of COMMON_LDFLAGS variable. It was a pointless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29784 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-19 09:56:18 +00:00
diego 1d823d4b0f Add CONFIG_LPC to config.h as well (needed by FFmpeg).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29782 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-19 09:41:30 +00:00
diego 7210df9cb9 Add CONFIG_LPC to config.mak (needed by FFmpeg).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29781 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-19 09:10:27 +00:00
reimar 07c11742a9 Remove many uses of tmp_run.
Checking that installed header and library match is not really our task,
also if desired it would be more correct to do it at runtime (e.g. because
of distributed binaries, or system updates gone wrong, ...).
tmp_run also slows down configure on systems with slow fork like MinGW.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29753 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-06 06:43:00 +00:00
Uoti Urpala 0191da3cf4 configure: Disable OpenAL support by default
There's apparently a new OpenAL version which contains some constructor
code that runs at startup if the binary links with OpenAL at all (even
if no OpenAL function is called). This startup code does some
nontrivial interaction with ALSA libraries and as a side effect this
idiocy also breaks test binaries run by configure, causing features to
not be detected. Avoid the problems by disabling OpenAL by default.
It's not a particularly good audio output method anyway and there are
almost certainly fewer users who would benefit from it automatically
being available than users who'd suffer from some kind of breakage
caused by it.
2009-10-06 05:19:14 +03:00
Uoti Urpala 7fd3eb0f74 Merge svn changes up to r29752
As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.
2009-10-06 04:48:00 +03:00
reimar 2946fb53a7 Add EXTERN_ASM define needed by FFmpeg on ARM.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29747 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-02 08:58:29 +00:00
reimar a04087cd67 Extend EBX_AVAILABLE check in a way that works for both OpenBSD/Haiku
and 64 bit OSX.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29743 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 18:45:02 +00:00
cehoyos 556cda2071 Intel compiler icc 11.1 supports compilation of internal mp3lib and internal liba52.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29725 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 21:25:56 +00:00
cehoyos 205a377349 Cosmetics: Fix whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29724 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 19:22:48 +00:00
reimar a5abf5851c Amend previous commit: both zlib decoder and encoder must be disabled
if zlib is not available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29720 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 21:22:01 +00:00
reimar 08073d325a Disable libavcodec zlib decoder when zlib is not available, fixes compilation
in that case.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29719 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 21:09:29 +00:00
reimar ac8b90aec1 Do not override host_arch in x86 vs. x86_64 detection if it was forced via --target.
Patch by Andrew Wason [rectalogic rectalogic com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29717 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-25 16:46:39 +00:00
diego e3b68c2745 Sync with current FFmpeg HEAD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29714 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-24 10:09:14 +00:00
diego 76141a5727 sync with FFmpeg build: BUILD_STATIC --> CONFIG_STATIC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29713 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-24 09:47:36 +00:00
lorenm 1893615656 sync to x264-r1260 (which changed api)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29704 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 12:01:04 +00:00
reimar d410371fa2 Add autodetection for ARM NEON SIMD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29694 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-19 13:58:38 +00:00
reimar 4aeef29590 Use a compilation check to distinguish between x86 and x86_64, uname and
CFLAGS checks alone are not reliable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29693 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-19 13:36:58 +00:00
reimar a7845321db Add a check for availability of ebx register, needed for
architectures that require PIE like Haiku or 64 bit OSX.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29692 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-19 13:18:48 +00:00
reimar 37925f4a2e Treat Haiku as BeOS (only changes the displayed name actually)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29691 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-19 12:56:19 +00:00
Uoti Urpala e1ecc43152 Merge svn changes up to r29684 2009-09-16 22:28:12 +03:00
cehoyos f443f004c9 Allow disabling and enabling lower-case codecs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29662 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 16:32:21 +00:00
reimar f49f430159 100l, forgot to use "test" for checking the value of the quicktime variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29656 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 08:50:03 +00:00
Uoti Urpala 0e1b7765be Merge svn changes up to r29644 2009-09-04 19:49:35 +03:00
reimar dcfd043ea8 10l, -framework QuickTime must be added to extra_ldflags, not libs_mplayer since
QuickTime is used also in mencoder (in the audio and video decoders and possibly
from demux_mov, even though the latter one should only use the includes and not
require linking).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29644 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 12:24:45 +00:00
reimar 0f4dfe16f8 Split QuickTime check off from quartz check and use the result to enable/disable
the QTX codec support.
This is necessary since 64 bit compiles on OS X 10.5 at least do not support QuickTime.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29641 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 09:35:58 +00:00
reimar 4338a8d7f4 Move OpenGL test below CoreVideo. This ensures -lGL will come after -framework OpenGL which
resolves vo_corevideo crashes due to namespace conflicts (e.g. glEnable, glBegin, ...).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29639 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 07:57:06 +00:00
diego 6720a0d0cd The libamrnb *en*coder, not the *de*coder should be added to the list of
encoders to enable in libavcodec.
patch by Wang William, william0wang gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29605 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 08:30:15 +00:00
reimar 8eab1ca95c Also check linker flags to make sure that liveMedia libraries are there, too,
not just the headers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29598 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:00:37 +00:00
Uoti Urpala 7431eabaab Merge svn changes up to r29544 2009-08-22 04:31:30 +03:00
diego 9e9a5a3cac Fix detection of mips arch on NetBSD/sgimips.
based on a patch by Andrew Randrianasulu, randrik mail ru


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29539 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 08:47:46 +00:00
Uoti Urpala 95da34aa07 Merge svn changes up to r29532 2009-08-18 02:29:37 +03:00
cehoyos b3506ab290 Allow compilation with gcc 2.95.3 if videodev2.h does not support it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29516 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-14 09:31:16 +00:00
diego 01b4e4429e Make sure that unavailable message languages are not accepted.
patch by Samuli Suominen, ssuominen unk fi


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29473 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-03 13:51:33 +00:00
ben 6c6be8ac1e Add a variable in config.mak whether SHM support is enabled or not.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29463 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-31 20:13:02 +00:00
Uoti Urpala 4a36b51ea6 Merge svn changes up to r29455 2009-07-29 01:32:03 +03:00
Uoti Urpala 29bc25b6d4 configure: Drop "_so" naming for FFmpeg libraries
Externally-compiled libraries are now the only option so change the
options and variables to use the library name only without "_so" or
"_a" suffix. The previous naming was also confusing because the "_so"
libraries could actually be static.
2009-07-27 02:49:33 +03:00
diego f9dcd2a235 Set both HAVE_BIGENDIAN and WORDS_BIGENDIAN.
Both definitions are used in different places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29441 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 17:43:06 +00:00
Uoti Urpala a92a43b91f build: Readd support for code depending on FFmpeg internals
Add configure option --ffmpeg-source-dir=PATH. If the user specifies
this option then building code that depends on FFmpeg internals is
enabled and the files files which use internal lavf headers will get
them from this path. The FFmpeg libraries linked with must export
needed internal symbols.
2009-07-26 20:22:48 +03:00
Uoti Urpala 78ea550f0f build: Remove code for internal FFmpeg build
Remove some now unnecessary parts that were used for the internal
FFmpeg build, mainly configure tests for FFmpeg features and Makefile
logic for building it.
2009-07-26 20:22:48 +03:00
Uoti Urpala 4ab6e16888 configure: Make multiple --extra-cflags/ldflags additive
This change makes it easier to pass those flags from a build script
while still allowing the user to specify additional flags too.
2009-07-26 20:22:48 +03:00
Uoti Urpala 546c3fb53c Remove internal libass tree
Remove the libass/ directory and use the newest standalone version of
the library instead.
2009-07-26 20:22:43 +03:00
cehoyos 06c122f001 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29440 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 14:40:05 +00:00
Uoti Urpala 6fbcf16cfb configure: Compile with -O2 instead of -O4
-O4 (which GCC interprets the same as -O3) gives no consistent
performance advantage, being significantly worse than -O2 sometimes.
-O2 gives faster compilation and smaller binary.
2009-07-26 06:16:52 +03:00
Uoti Urpala cd4e8dc1fa Disable functionality requiring libswscale internals
The following are affected: vo_yuv4mpeg, vf_halfpack, vf_palette,
vf_rgb2bgr, vf_yuy2, vo_mga, vo_xmga. In vo_yuv4mpeg, only disable
RGB support (which is probably little used). Others are disabled
completely for now.

vo_mga and vo_xmga are disabled by preventing configure from enabling
them. The rest is placed under LIBSWSCALE_INTERNALS variable which
isn't currently enabled anywhere.
2009-07-26 06:16:52 +03:00
Uoti Urpala a810867d04 configure: Improve pkg-config tests for FFmpeg libraries
Tests for libavcodec, libavformat, libavutil and libswscale used the
CFLAGS from pkg-config in a test compile but did not add them to the
flags used during the main build, so the compiler could fail to find
the headers then. Add the flags to the commands used during the main
build too. libpostproc had no pkg-config test at all. Add one.
2009-07-26 06:15:30 +03:00
diego 4593633f58 Bandaid compilation fix: Disable ivtv VIDIX driver until a proper test exists.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29433 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 21:24:45 +00:00
diego bcd7541f4e The Makefile variable names for external libraries in FFmpeg changed.
Adapt their names in config.mak, closes Bugzilla #1513.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29432 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 21:09:00 +00:00
diego 944f7811c5 Remove redundant ivtv VIDIX driver variable declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29430 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 17:05:42 +00:00
diego e696ba4ba0 The ivtv vo driver and the ivtv VIDIX driver are unrelated; do not disable the
VIDIX driver when the ivtv vo driver has been disabled.
patch by Martin Dauskardt, martin.dauskardt gmx de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29429 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 17:03:28 +00:00
diego e2ae312a37 Change libamr support to libopencore-amr support.
libamr support was removed from FFmpeg.
based on a patch by Andrew Wason, rectalogic rectalogic com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29426 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-18 15:07:26 +00:00
cehoyos c266aa7c21 Restore alphabetic order for HAVE_ defines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29421 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-17 17:43:08 +00:00
diego 4ce671eb44 Remove CONFIG_LIBAMR_NB_FIXED #define, which no longer exists in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29420 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-17 13:58:07 +00:00
cehoyos 7f6cfb7935 Assume HAVE_ATTRIBUTE_PACKED.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29419 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-17 09:55:23 +00:00
Uoti Urpala fdb2f3c8ab Merge svn changes up to r29417 2009-07-12 15:52:00 +03:00
cehoyos 5671f4329e Fix compilation after FFmpeg r19395.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29417 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-11 09:41:44 +00:00
reimar e404a97a73 Disable libavcodec AAC encoder, there are too many systems where it doesn't compile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29416 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-09 13:28:56 +00:00
Anton Khirnov 87366694d8 Remove the internal GUI
The GUI is badly designed and too closely coupled to the internal
details of other code. The GUI code is in bad shape and unmaintained
for years. There is no indication that anyone would maintain it in the
future either. Even if someone did volunteer to implement a better
integrated GUI having the current code in the tree probably wouldn't
help much. So get rid of it.
2009-07-07 21:49:42 +03:00
Uoti Urpala a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
Uoti Urpala 6d908205fb Merge svn changes up to r29304 2009-07-07 02:07:11 +03:00
diego 63b0136fea Modern Solaris versions have different default CD-ROM devices.
patch by Pawel Tecza, ptecza uw.edu pl


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29387 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 23:31:17 +00:00
Grigori Goronzy 91d0d3a082 Add OSS4 vmix volume control to ao_oss
Support for per-application volume control, introduced by OSS4.
This adds a check in configure to add the proper include path
to the CFLAGS, if needed. The path is taken from /etc/oss.conf.
2009-06-24 20:49:21 +02:00
diego de592450d5 Do not use -rdynamic on Solaris, where the flag is unsupported.
patch by Niklas Edmundsson, nikke acc.umu se, Bugzilla #1496


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29379 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-22 23:35:13 +00:00
diego 08a14cf5a4 Fix setting of DOC_LANGS and MAN_LANGS, the wrong variables were being used.
This makes XML documentation generation work again.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29372 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-19 15:20:59 +00:00
cehoyos 811779d337 Do not auto-detect old libnut installations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29366 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-16 13:32:51 +00:00
diego 53d273ec22 Rename LIBVORBIS Makefile variable to VORBIS.
The latter is more clear as it can represent either Tremor or libvorbis.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29365 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-14 21:09:35 +00:00
diego 961ef54977 100l: Add missing $s to default language variable checks, which prevented
fallback language settings from taking effect.
patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29364 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-14 18:51:36 +00:00
diego 2b78779100 Overhaul translation handling completely and add options to install specific
documentation and man page translations.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29363 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-14 14:55:01 +00:00
diego ee57be5389 cosmetics: Drop leading underscore from _language* variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29362 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-14 13:25:54 +00:00
diego 4a034d1f80 Allow setting message language separately from documentation language.
patch by Steve Dibb, steve.dibb gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29361 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-14 12:42:06 +00:00
diego d2a3ba44e8 Drop redundant setting of message language to English when all languages
are enabled. This is the default anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29360 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-14 12:31:35 +00:00
reimar 166ffef96b Configure needs AS to be set for the Makefiles.
Note that this may not be a pure assembler (i.e. AS=as is wrong), it must be
a gcc-compatible assembler with preprocessor (e.g. AS=gcc).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29344 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-02 18:37:31 +00:00
reimar 3cd6ded7ea Add actually working support for PPC64
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29336 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-01 09:35:16 +00:00
reimar f4da0f9ec1 Use target_arch and target_subarch which is more similar to what FFmpeg uses
and makes more sense when adding proper PPC64 or MIPS64 support.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29335 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-01 09:25:20 +00:00
reimar b8f1cf16db Add some missing FFmpeg archs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29334 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-01 09:20:22 +00:00
reimar ae2c370375 Set XVR100 make variable. Fixes compilation when support for xvr100 was detected.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29315 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-19 08:56:23 +00:00
diego eafe5b7517 Make sure that -Ilibdvdread4 appears in CFLAGS before any system directories
so that internal dvdread headers do not conflict with system headers.
Fixes Bugzilla #1465.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29304 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 19:25:35 +00:00
diego cf7bc50739 Add HAVE_PPC64 definition for FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29300 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 07:25:04 +00:00
diego 0d5ab8b6d9 Make sure CONFIG_MUXERS is always set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29299 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 06:52:57 +00:00
diego 8e66013c90 cosmetics: indentation fixes for the dvdread check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29283 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 13:15:31 +00:00
diego 6dc61f228d Fix misplaced 'fi' in external dvdread test.
patch by Diogo Franco, diogomfranco gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29282 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 12:52:44 +00:00
Uoti Urpala 1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
diego 86c9fb2e89 lirc anc lircc are MPlayer-only, so add LDFLAGS for MPlayer link only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29277 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 16:21:03 +00:00
diego 5bad4ba482 The Apple remote code needs the Cocoa framework to link.
Apple remote LDFLAGS are only necessary for linking MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29275 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 13:58:42 +00:00
diego c12922d678 Add -framework Carbon to LDFLAGS when Mac OS X finder or bundle is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29274 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 21:34:56 +00:00
diego ddb7269a1e cosmetics: Move Quartz and CoreVideo checks into the vo driver section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29269 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 23:02:59 +00:00
diego 5bc20d8d3c LDFLAGS for CoreVideo and Quartz should be MPlayer-only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29268 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 21:03:56 +00:00
diego d0022933fe libdvdcss requires the Carbon framework to link on Mac OS X.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 18:45:59 +00:00
diego bf26ad6611 cosmetics: Move $def_dvdcss to a more sensible place in config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29266 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 18:04:53 +00:00
diego d46d132b1f cosmetics: Move CoreAudio check to audio output section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29265 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:57:44 +00:00
diego ab5760ab33 Add #define for HAVE_DVDCSS_DVDCSS_H (needed by internal libdvdread) to config.h
instead of passing -D on the compiler command line.
This is more convenient and already done with most preprocessor definitions
needed by external libraries.
Previously the definition was passed on the command line because libdvdread was
missing the necessary config.h #include, which was now added.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29263 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:30:50 +00:00
diego a3f5c392f5 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29261 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:17:17 +00:00
diego c3d3743ad7 Allow disabling and enabling VCD support through command line parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29260 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:15:54 +00:00
diego ceb919a8c4 CoreAudio LDFLAGS should be MPlayer-only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29259 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 09:08:53 +00:00
diego 9b7c75da73 Improve CoreAudio check: Use all required headers and frameworks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29258 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 08:49:07 +00:00
diego 614a0e9800 Simplify Mac OS X Finder and Mac OS X Bundle file locations checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29257 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 08:46:37 +00:00
diego 114fa5bd06 CONFIG_QUICKTIME should be set depending on the state of QTX support.
This fixes linking on Mac OS X with vo_quartz disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29255 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 18:29:55 +00:00
diego 27bc918ffe Rename macosx video output driver to corevideo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29252 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 16:55:05 +00:00
diego e3ec5b1fd3 Rename macosx audio output driver to coreaudio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:53:47 +00:00
diego 9f45c3a0ae QuickTime codecs support requires -framework QuickTime to link on Mac OS X.
patch by Emanuele Giaquinta


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29250 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:49:42 +00:00
diego 51a6bec160 Replace QuickTime.h #include with Carbon.h, which is really needed.
patch by Emanuele Giaquinta


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29249 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:40:22 +00:00
diego a094d6279b Improve CoreVideo check: Test more #includes, add -framework Carbon to LDFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29247 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 13:16:04 +00:00
diego 0044b18877 Add information about configure options to config.mak.
This is useful for debugging and convenient outside of config.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29246 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 11:44:36 +00:00
diego 480a9e563c Revert previous two commits, the CoreVideo vo needs both OpenGL and Cocoa.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29238 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-26 08:59:18 +00:00
diego ebbeef12db Fix typo in CoreVideo linker flags: the Carbon, not Cocoa framework is needed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29236 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 18:43:35 +00:00