RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-23 08:26:56 +00:00
Code Issues Releases Wiki Activity
32,071 Commits 42 Branches 86 Tags 173 MiB
bd5aaa5468
Commit Graph

2773 Commits

Author SHA1 Message Date
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
diego
2ce1ec49e7 Remove unnecessary -framework OpenGL from CoreVideo linker flags. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29235 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-25 18:39:19 +00:00
diego
1668788808 whitespace cosmetics: reindent Mac OS X checks, remove trailing whitespace 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29234 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-25 17:52:55 +00:00
diego
6f9ec12491 Split generic OS X API check into separate CoreAudio, CoreVideo, Quartz checks. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29233 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-25 17:48:48 +00:00
diego
86075b391c typo in XFORM asm check, noticed by Emanuele Giaquinta 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29232 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-25 16:37:08 +00:00
diego
d6b2a50fba Pass argc and argv parameters to main() function in SDL test. 
SDL renames the main function via a macro and later passes it parameters.
This fixes the SDL check on at least Mac OS X, continues to work fine on Linux.
patch by vmrsss  vmrsss gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29221 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-23 07:39:39 +00:00
diego
e28b5cc631 Add HAVE_LDBRX to config.h for FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29200 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-20 00:10:45 +00:00
diego
7948a807fb Add check for XFORM ASM, needed by FFmpeg/PPC. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29199 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-20 00:10:09 +00:00
diego
4e1b85c726 Rely on POSIX-compatible head/tail versions that understand the -n option. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29185 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-16 10:02:10 +00:00
diego
b6d31704a9 Replace all `` by $(), it is more readable and easier to nest. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29183 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-15 20:00:26 +00:00
diego
10295ba5a0 Simplify OS detection functions. 
The return statement in the functions appears unnecessary; remove it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29182 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-15 17:08:41 +00:00
diego
a5eaafc179 Use extra_cflags variable instead of CFLAGS to add system-specific CFLAGS. 
Otherwise the CFLAGS warning gets triggered and necessary CFLAGS are not set.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29171 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-12 17:07:30 +00:00
diego
3818abb4ae Move all CFLAGS checks together at the beginning of configure. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29169 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-10 18:29:01 +00:00
diego
465abf0b8d Move thread-related CFLAGS settings into pthread test. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29168 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-10 17:39:44 +00:00
diego
446980680f Remove unnecessary Darwin default CFLAGS and LDFLAGS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29165 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-10 13:38:57 +00:00
diego
b4546308e8 Move darwin CFLAG settings to darwin section at the beginning of configure. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29164 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-10 13:37:59 +00:00
diego
01415637a0 Move amigaos CFLAG settings to amigaos section at the beginning of configure. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29163 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-10 13:12:28 +00:00
diego
e2023a9037 gcc <3.1 is unsupported on Darwin, no need to check for this. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29162 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-10 13:09:39 +00:00
Uoti Urpala
0e8c38c19b Merge svn changes up to r29154 
Synchronizes runtime CPU detection handling in the build system with
latest FFmpeg.
 2009-04-09 02:38:37 +03:00
ramiro
ca242e5f73 Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29154 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-08 20:21:21 +00:00
diego
79701be883 Fix wrong syntax in test example, noticed by Jason Holt, jholt google com. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29151 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-08 11:56:09 +00:00
Uoti Urpala
6dd56815b4 Merge svn changes up to r29150 2009-04-08 02:46:32 +03:00
diego
389853416f Fix passing CFLAGS and LDFLAGS with = in them as configure parameters. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29138 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-04 14:17:53 +00:00
Uoti Urpala
ce0bf1bd4a Merge svn changes up to r29136 
Fixes compilation with latest FFmpeg.
 2009-04-03 16:45:21 +03:00
cehoyos
431ac86c7b Fix compilation for newly added VAAPI_HWACCEL's. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29135 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-03 08:08:44 +00:00
Uoti Urpala
d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
bircoph
a4861528c6 Support for libbs2b audio filter. 
Add auto detection and selection routines to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29131 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-02 19:01:23 +00:00
cehoyos
06c07eb5c0 Fix compilation with libavcodec's HWACCEL. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29130 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-02 18:38:15 +00:00
Uoti Urpala
cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03:00
reimar
c9120b9892 Check for ddk/ntddcdrm.h header before enabling VCD on mingw. 
Fixes a compilation issue on mingw-w64 which does not have that header.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-28 18:53:26 +00:00
reimar
0e70761fd9 Rename local TMP variable to TMPRES to avoid a clash with the 
variable holding the path used for temporary files - this is used
by mingw-w64 and this change avoids crashes with it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29068 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-27 17:14:58 +00:00
diego
8a629b04c5 cosmetics: Drop leading underscore from extra_ variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29057 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-25 19:48:05 +00:00
diego
2c5574088d Update help output with previous --extra-ldflags change. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29049 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-24 09:32:35 +00:00
diego
1b2ad68721 Replace --with-extralibdir option by --extra-ldflags, which accepts arbitrary 
LDFLAGS. Also rename the corresponding variable for consistency.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29045 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-24 00:22:51 +00:00
diego
d13c228316 typo fix: Remove stray '-' from --extra-cflags option evaluation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29044 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-23 23:41:24 +00:00
diego
552a5d9ac1 Replace --with-extraincdir option by --extra-cflags, which accepts arbitrary 
CFLAGS. Also rename the corresponding variables for consistency.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29043 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-23 23:37:51 +00:00
diego
a5b7fe4b7c Get rid of pointless EXTRA_INC and EXTRAXX_INC config.mak variable indirection. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29042 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-23 22:53:42 +00:00
diego
941a7941de Initialize HAVE_FAST_UNALIGNED definition to 0 so that it is never undefined. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29023 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-21 16:00:15 +00:00
diego
5b8a842476 Add CONFIG_SWSCALE_ALPHA and HAVE_VIRTUALALLOC config.h #defines for FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29019 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-21 09:18:36 +00:00
cehoyos
b1fc7adc3e Support icc 11.1. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28995 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-18 21:48:35 +00:00
cehoyos
a2bfb53d16 Older versions of <vdpau/vdpau.h> will fail during compilation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28989 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-18 09:17:15 +00:00
diego
5148ca89d2 HAVE_THREADS should be initialized to 0, it is a 0/1 #define in FFmpeg. 
patch by Dave Yeo, dave.r.yeo gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28952 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-15 09:17:42 +00:00
Uoti Urpala
ae2faad666 Merge svn changes up to r28951 2009-03-14 23:52:45 +02:00
diego
366c3fa13d KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian net 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28950 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-14 18:44:58 +00:00
diego
e7d3dce041 Add /usr/X11R7 to the list of directories in which to search for X11 includes 
and libraries. patch by Bernd Ernesti, mplayer-dev-eng lists veego.de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28946 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-14 16:00:21 +00:00
reimar
db0be49509 Fix compilation with --charset=noconv 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28939 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-13 16:42:42 +00:00
reimar
7397dbcb66 Update x264 version check for version required by lavc. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28869 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-07 12:50:52 +00:00
Uoti Urpala
e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
diego
1005952a8b Only add -Ilibdvdnav to the CFLAGS of the files that require it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 22:19:47 +00:00
diego
23599b030c DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 11:36:39 +00:00
Uoti Urpala
66f6f9f076 Merge svn changes up to r28712 2009-02-23 21:00:52 +02:00
uau
9aa9e86517 configure: Make the special dvdnav test the last one again 
The libdvdnav linker flag handling is hacky and can add flags that
make any compile attempt using them fail unless MPlayer's internal
dvdread has been compiled and is linked as a part of the resulting
binary. For this reason no more tests using the common flags can be
performed after the flags from the dvdnav test have been added.
However the dvdnav test was no longer the last one despite some warning
comments. Move it back to the last position and make the warnings a
bit more explicit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28703 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-23 01:39:27 +00:00
diego
fa33e96dd8 Make alpha arch detection more lenient. Taken from the Debian patchset. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28699 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-21 22:08:50 +00:00
diego
2c48477e53 Add -ffast-math to LDFLAGS as well as to CFLAGS. 
patch by Piotr Kaczuba, pepe attika.ath cx


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28694 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-21 20:25:02 +00:00
diego
1c6964f547 Add HAVE_GETHRTIME and HAVE_INLINE_ASM definitions for FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28692 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-21 17:36:26 +00:00
Uoti Urpala
186e5a998c Merge svn changes up to r28641 
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
 2009-02-18 01:45:36 +02:00
diego
e5ee1232c5 AVR32 apparently supports fast unaligned accesses. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28641 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 22:05:25 +00:00
diego
e9d5b64a29 Also set HAVE_EBP_AVAILABLE in debug mode. 
patch by Gwenole Beauchesne, gbeauchesne splitted-desktop com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28631 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 11:40:59 +00:00
diego
be8c67909b Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning: 
mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 11:16:19 +00:00
diego
e98a6e2bff Convert HAVE_MEMALIGN into a 0/1 definition, fixes the warning: 
mem.c:67:7: warning: "HAVE_MEMALIGN" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28628 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 10:41:13 +00:00
uau
991d64b31f Fix compilation without VDPAU 
The commit adding vo_vdpau had two bugs that broke compilation when
VDPAU was not enabled.
- video_out.c used "#ifdef CONFIG_VDPAU", but it's always set to 0 or 1
- In configure, MPEG1_VDPAU_DECODER was dropped from the list of
  libavcodec codecs to disable when moving VDPAU-related ones from the
  always-disabled list to a conditinal one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28620 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 00:09:15 +00:00
reimar
7e9fd9351c Add support for VDPAU video out, including hardware decoding. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-16 20:58:13 +00:00
diego
3983328889 Make configure recognize avr32. 
patch by Hans-Christian Egtvedt, hans-christian.egtvedt atmel com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28612 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-16 17:02:16 +00:00
Uoti Urpala
738f66b1bc Merge svn changes up to r28549 2009-02-13 03:52:51 +02:00
diego
802f91138e On clean/distclean, remove binaries with all types of executable suffixes. 
This helps clean a tree completely before and after crosscompiling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28539 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-12 12:17:50 +00:00
Uoti Urpala
1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
diego
ceae4989a2 Port check for 10 assembler operands support from FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28534 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-11 23:11:06 +00:00
diego
cdfafa6999 Add priority support for OS/2 and factorize the Windows priority support. 
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-10 15:34:44 +00:00
diego
97e427039d Add proper check for posix_memalign(), needed for FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28519 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-10 02:01:35 +00:00
diego
883133fe45 cosmetics: Remove leading underscore from all def_ variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28489 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 22:49:52 +00:00
diego
a760f58636 Add CONFIG_LIBAMR_NB_FIXED #define for FFmpeg to config.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28488 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 21:57:14 +00:00
diego
94a8f89c57 CONFIG_LIBAMR_NB/WB should be 0/1 #defines. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28487 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 21:56:18 +00:00
diego
49f88ad861 Conditionally compile aclib.c instead of placing #ifdef around its content. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 03:42:00 +00:00
diego
d365ca2eab Add CONFIG_LIBVORBIS #define for FFmpeg to config.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28482 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 03:39:07 +00:00
diego
95c44000d7 Give _XOPEN_SOURCE #define an explicit 600 value. Fixes build on Open Solaris. 
patch by Imran Syed, freakabcd gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28480 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-07 17:34:45 +00:00
diego
38daeba8f8 Add config.h/config.mak bzlib variables missed in last commit. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28478 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-07 15:36:50 +00:00
diego
ba38cd7c0e Add bzlib check for FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28477 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-07 15:33:10 +00:00
diego
2817da6233 Convert CONFIG_ZLIB into a 0/1 option. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28475 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-07 15:23:55 +00:00
diego
66ae932317 Add READ_CACHE_TRACE #define for libdvdnav. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28474 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-07 15:19:43 +00:00
diego
d00d9a57f8 cosmetics: Regroup some FFmpeg config.h options. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28466 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-04 19:08:44 +00:00
diego
9ec12d04bd Add proper check for arpa/inet.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28465 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-04 19:04:22 +00:00
diego
8b2dc616eb Do not hardcode HAVE_DOS_PATHS, set it by OS instead. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28462 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-04 18:22:28 +00:00
Uoti Urpala
9790f4e6e7 Merge svn changes up to r28461 2009-02-04 00:28:17 +02:00
reimar
25f5652082 Hack: fix MINGW compilation by hard-coding HAVE_ARPA_INET_H 
to 0 if __MINGW32__ is defined.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28460 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-03 12:17:49 +00:00
reimar
3819692fda swab() needs _XOPEN_SOURCE to be defined. 
Fixes two implicit declaration warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28455 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-03 10:39:56 +00:00
rathann
4557c10cb0 Chinese manpage is actually simplified Chinese (zh_CN), so rename the manpage 
directory to reflect that. Also update configure to handle two-part lang codes
for manpages.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28446 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 23:40:26 +00:00
diego
820e400ba5 Simplify inet_pton/inet_aton checks. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28442 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 14:57:01 +00:00
diego
f6db24db92 Add some more definitions for FFmpeg to config.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28441 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 14:42:57 +00:00
diego
73608fa00b cosmetics: Fix indentation after last commit. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28440 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 14:39:33 +00:00
diego
7e1662839a Restructure network tests: Always check for both inet_aton and inet_pton. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28439 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 14:38:28 +00:00
diego
0d86a0f652 HAVE_DCBZL should be a 0/1 definition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28438 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 14:00:50 +00:00
diego
0f65d3be9d Convert HAVE_WINSOCK2_H into a 0/1 definition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28437 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 13:42:27 +00:00
diego
3b222d68b0 HAVE_ATON --> HAVE_INET_ATON to match FFmpeg and give it a 0/1 value. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28435 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 13:33:35 +00:00
diego
be5f5c7046 Convert HAVE_CLOSESOCKET and HAVE_SOCKLEN_T into 0/1 definitions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28434 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 13:16:46 +00:00
diego
85eac18b0a Add a few more #defines for FFmpeg to config.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28433 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 13:13:15 +00:00
diego
89fc99d8a0 CONFIG_LIB* are defined as 0/1 in FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28430 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 12:52:38 +00:00
diego
6053ca62bb Revert Solaris PATH modification workaround. 
It is incomplete anyway and configure should not fiddle with user configuration.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28421 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 11:28:31 +00:00
diego
917aadbba6 Add CONFIG_FASTDIV and CONFIG_POWERPC_PERF to config.h for FFmpeg compilation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28416 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 02:22:56 +00:00
diego
83ebcb0db7 Set a sane default path on Solaris. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28412 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 23:19:16 +00:00
diego
5de6238a26 cosmetics: Move memalign_hack define next to other FFmpeg defines in config.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28411 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 23:12:27 +00:00
diego
261ee578ee Make sure CONFIG_MEMALIGN_HACK is always #defined. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28409 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 22:45:18 +00:00
diego
4c4dc61228 Make sure HAVE_ALTIVEC_H is always #defined. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28408 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 22:37:53 +00:00
diego
83f2da06c3 Make sure HAVE_FAST_64BIT is always #defined. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28407 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 22:37:12 +00:00
diego
c98fd985c2 Add bswap check, needed for FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28406 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 22:34:52 +00:00
diego
693c550d05 Add #define HAVE_DLFCN_H to config.h, libdvdread4 needs it. 
Fixes Bugzilla #1399.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28405 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 21:16:54 +00:00
diego
98074f2b4e HAVE_LRINT and friends should be defined to 0/1. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28404 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 20:56:17 +00:00
Uoti Urpala
ccf4d9e96c Merge svn changes up to r28403 2009-01-31 04:52:15 +02:00
diego
dc4b6fcddc Make CONFIG_XVMC a proper FFmpeg-style 0/1 definition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 23:58:07 +00:00
diego
0927520cbb Add CONFIG_SWSCALE to config.h, we always enable the software scaler. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28401 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 23:47:18 +00:00
diego
72685f8efc Add 4 more config.h #defines for libfaad2. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28400 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 23:40:13 +00:00
diego
7e85d78826 Add -Wundef to CFLAGS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28393 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 21:45:54 +00:00
diego
c54982e5da Enable RDFT in FFmpeg, some codecs depend on it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28392 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 20:48:47 +00:00
diego
9cc309bcc8 Enable internal dvdread support on OS/2. 
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28391 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 20:20:06 +00:00
diego
eb4a4604c0 HAVE_3DNOW --> HAVE_AMD3DNOW 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-26 09:29:53 +00:00
Uoti Urpala
dd888b05ff Merge svn changes up to r28366 
Contains more changes needed to sync build system with latest FFmpeg.

Conflicts:
	Makefile
	configure
	mplayer.c
 2009-01-26 00:58:15 +02:00