1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-24 00:46:58 +00:00
Commit Graph

2573 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