1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-30 03:32:50 +00:00
Commit Graph

31171 Commits

Author SHA1 Message Date
Uoti Urpala
13221a7165 Merge svn changes up to r30663
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
2010-03-10 00:13:11 +02:00
Uoti Urpala
c4f7b9666f Ignore svn change r30644 2010-03-10 00:00:48 +02:00
Uoti Urpala
c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala
22a06c4ae5 Ignore svn changes up to r30607 2010-03-09 23:45:20 +02:00
Uoti Urpala
89c5ed5e9a Merge svn changes up to r30605 2010-03-09 23:44:57 +02:00
Uoti Urpala
0670a5d090 Ignore svn changes up to r30601
Most done long ago in git, and the additional changes in svn are
mostly bugs...
2010-03-09 23:42:31 +02:00
Uoti Urpala
42bf12c2d3 Merge svn changes up to r30595
Conflicts:
	mplayer.c
	vidix/nvidia_vid.c
2010-03-09 23:37:00 +02:00
Uoti Urpala
fa34ea27b9 Ignore svn changes up to r30579 2010-03-09 23:24:45 +02:00
Uoti Urpala
fa51c3b07c Merge svn change r30576 2010-03-09 23:23:02 +02:00
Uoti Urpala
d7f7bffce5 Ignore svn changes up to r30575 2010-03-09 23:22:07 +02:00
Uoti Urpala
e03e0597d0 Merge svn changes up to r30570 2010-03-09 23:20:56 +02:00
Uoti Urpala
f910c8c9d8 Ignore svn change r30561
Already done in git.
2010-03-09 23:19:19 +02:00
Uoti Urpala
c31aa7b953 Merge svn change r30560 2010-03-09 23:18:19 +02:00
Uoti Urpala
ad43180c16 Ignore svn changes up to r30559
Something similar was already done in git, plus r305598 is wrong;
mp_core.h is not suitable for inclusion in random files throughout the
codebase.
2010-03-09 23:14:19 +02:00
Uoti Urpala
8365d174b6 Merge svn changes up to r30557 2010-03-09 23:09:46 +02:00
Uoti Urpala
7fc3bb2a88 Ignore svn changes up to r30553 2010-03-09 23:08:32 +02:00
Uoti Urpala
81c4223448 Makefile: remove outdated vf_halfpack entry
Remove an outdated entry left over from when vf_halfpack depended on
libswscale internals.
2010-03-09 23:06:40 +02:00
Uoti Urpala
36e7a20e69 Merge svn changes up to r30550 2010-03-09 23:03:14 +02:00
Uoti Urpala
70fb003a9f Ignore svn change r30530
Already done better.
2010-03-09 22:47:58 +02:00
Uoti Urpala
8e593f5a34 Merge svn changes up to r30529 2010-03-09 22:47:41 +02:00
Uoti Urpala
bf31241e93 Ignore svn change r30515
Incompatible and inferior version of stream support for external
libass subs.
2010-03-09 22:42:51 +02:00
Uoti Urpala
9786d38667 subs: support loading external ASS subtitles via stream layer
Previously the argument of the "-sub" option was always interpreted as
a local filename when trying to read it as a libass file. Use the
stream layer to read it instead, so that protocols like 'http://' are
also supported like they are for the main video/audio file.

Based on patch by Yuriy Kaminskiy <yumkam@mail.ru>
2010-03-09 22:35:53 +02:00
Uoti Urpala
173beb5608 Merge svn changes up to r30514 2010-03-09 19:58:02 +02:00
Uoti Urpala
ed0237e7d3 Ignore svn changes up to r30505 2010-03-09 19:44:53 +02:00
Uoti Urpala
bc0f524909 Merge svn changes up to r30502
Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb.h
	libswscale/swscale.c
	libvo/x11_common.c
2010-03-09 19:44:28 +02:00
Uoti Urpala
a1b84c2080 Ignore svn change r30495
FFmpeg build stuff.
2010-03-09 19:35:41 +02:00
Uoti Urpala
5c6795a687 Merge svn changes up to r30494
Conflicts:
	libvo/vo_gl.c
	libvo/x11_common.c
2010-03-09 19:34:30 +02:00
Uoti Urpala
8a93561c81 Ignore svn changes up to r30486 2010-03-09 19:29:54 +02:00
Uoti Urpala
f1b6cdbe9d Merge svn changes up to r30484 2010-03-09 19:24:47 +02:00
Uoti Urpala
108e10416b Ignore svn changes up to r30479 2010-03-09 19:20:04 +02:00
Uoti Urpala
12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
Uoti Urpala
323890871d build: remove separate mp_msg-mencoder.c
mp_msg-mencoder.c was separate from mp_msg.c only to compile a version
without a GUI dependency when the internal GUI was enabled. Since the
GUI has been removed the same mp_msg.o can be linked in all binaries.
2010-03-09 19:10:06 +02:00
Uoti Urpala
2ca2bf4079 Ignore svn change r30464
Useless FFmpeg build stuff.
2010-03-09 19:03:05 +02:00
Uoti Urpala
b0986b3760 Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
2010-03-09 18:59:15 +02:00
Uoti Urpala
5fc54a6caa demuxer.h: increase input buffer padding to 64 to match FFmpeg
FFmpeg increased the amount of padding that must be readable beyond
input buffers without SIGSEGV from 8 to 64, and the MPlayer value must
be changed accordingly.
2010-03-09 15:00:37 +02: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
Uoti Urpala
b34a88e4f4 translations: tweak cases that relied on concatenating adjacent strings
Tweak some code parts that used to rely on string literals from
translation macros being concatenated with other adjacent string
literals. Break up the resulting string into independently translated
parts, so that the existing translations for those parts can still be
used.
2010-03-07 21:35:23 +02:00
Uoti Urpala
5234c72e28 Restore collapsed whitespace in output messages
For some reason commit e306174952, which
replaced translation macro names with the corresponding English
strings, also collapsed multiple consecutive space characters into
one. Change most of these back. In a couple of cases the amount of
whitespace is important for alignment, and for the rest it at least
keeps the strings closer to the existing translations.
2010-03-07 21:34:54 +02:00
Uoti Urpala
2569c2e2bc Make help text translatable
Translate help_text and also make all CONF_TYPE_PRINT option output
translatable (though no translations exist yet for anything other than
the main help text).
2010-03-07 21:34:40 +02: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
Uoti Urpala
5ff421bf5d vo_vdpau: improve VOCTRL_GET_EOSD_RES code
Remove the special case for fullscreen; the same variables should have
the correct values in windowed and fullscreen modes. This fixes libass
subtitle positioning in the (non-typical) case where you have black
bands inside a window. Behavior in fullscreen and in the typical
windowed case without borders should not be affected.
2010-02-26 17:11:04 +02:00
Uoti Urpala
0a2a78c62e Makefile: vf_halfpack no longer needs libswscale internals
vf_halfpack now uses only the public libswscale API, so compile it
unconditionally.
2010-02-26 17:11:04 +02:00
Grigori Goronzy
91f0b3c9a5 Add FLV4 fourcc to ffvp6f decoder
Some Flash videos use this fourcc and several websites indicate this is
a standard fourcc for Flash VP6 content.
2010-02-24 09:53:24 +01:00
reimar
bb54613ac1 Fix mov reference files: for video/quicktime mime do not force a demuxer
but do autodetection. This tries lavf first but will also try native demuxer
for reference files where open fails for the lavf demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30663 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 11:48:41 +00:00
reimar
1bb4898483 Print all 64 bits of seek position.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30662 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 11:21:51 +00:00
reimar
74b5e8b68a Make sure we do not try to use IPv6 with winsock2, we end up connecting
to random addresses, causing huge delays.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30661 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 11:13:01 +00:00
reimar
7afaac3a1f Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
This makes the vos try to redraw the video if they can.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30660 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 23:35:21 +00:00
reimar
dd79cbf17b Move code that makes the filter chain match the desired output format into
a separate function.
Call this function also from af_add, fixes audio corruption with e.g.
-softvol -af format=s16be (bug #1561).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30659 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 21:52:29 +00:00
diego
278d783cc7 Remove some pointless '#if 1' preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30658 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 19:41:17 +00:00
diego
ca81202840 Add dvd_parse_chapter_range() to stream_dvd.h instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30657 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 19:38:53 +00:00