1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-15 11:31:02 +00:00
Commit Graph

3312 Commits

Author SHA1 Message Date
Uoti Urpala
173beb5608 Merge svn changes up to r30514 2010-03-09 19:58:02 +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
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
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
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
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
e187de88a1 vo_vdpau: make queuing future frame flips adjustable
Add -vo vdpau suboptions "queuetime_windowed" and "queuetime_fs" to
specify the maximum number of milliseconds how far into the future a
frame flip can be queued using the VDPAU presentation queue
functionality. The intended main use of these options is to allow
disabling use of the queuing feature on systems where using it causes
choppiness in other graphics behavior (this is an NVIDIA driver issue;
the video itself isn't affected).
2010-02-05 20:20:31 +02:00
reimar
c5b0ff1cfa Fix hang with -fixed-vo due to VOFLAG_HIDDEN never being removed from window_state.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30514 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 16:42:13 +00:00
reimar
21208015e0 Print messages only after we are sure preinit will not fail anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30510 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 07:12:05 +00:00
reimar
1cd3b3c5dd Add support for VOFLAG_HIDDEN to the w32 backend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30509 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 22:46:45 +00:00
reimar
bf6dc310dc Set the PixelFormat right after creating the window and set it only once.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30508 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 22:46:01 +00:00
reimar
f34454b6b5 Create the OpenGL probe window as a hidden Window on X11.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30507 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 22:08:23 +00:00
cehoyos
212eb494ff 100l: Fix compilation (broken by me).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30504 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 17:27:38 +00:00
cehoyos
eacccfafc8 Clarify -vo vdpau:pullup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30503 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 16:56:28 +00:00
reimar
bc9eaa5404 Use vo_x11_clearwindow instead of XClearWindow, both for consistency and also
because vo_x11_clearwindow works as intended also when the background is
set to None.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30497 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-03 21:12:23 +00:00
reimar
115f7d2e63 Remove a duplicated vo_x11_sizehint, vo_x11_nofs_sizepos already calls this
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30493 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 21:27:17 +00:00
reimar
75bfddd3a2 Remove pointless initializers and also set geometry_*_changed to 0 when
-geometry did not adjust some values (instead of only ever setting them to 1
and never reset them).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30492 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 21:18:21 +00:00
reimar
f8e4b8ec7c Add support for autodetection during preinit and use that to detect a default
value for the yuv suboption.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30489 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 20:37:48 +00:00
reimar
18011824ac Avoid using options before autodetectGlExtensions to allow it to change them properly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30488 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 20:20:48 +00:00
reimar
2feef89fce Remove vo_config_count check from uninit, it should always be safe to run.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30487 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 20:16:57 +00:00
Uoti Urpala
1872284cdc VO: remove directfb from autoselected VOs
VO_directfb can call exit() if initialization fails. This makes
MPlayer exit without cleanup if autoselection tries it. This can be
seen for example by running something like this in an X terminal:
DISPLAY=foo mplayer file.mkv

The easiest fix for this is to remove directdb from the list of
autoselected VOs. The console VOs have enough problems that people who
want to use them should know what they're doing anyway.
2010-01-31 02:05:37 +02:00
diego
5640ddf49c Add missing #include, fixes the warning:
libvo/vo_png.c:147: warning: implicit declaration of function 'imgfmt2pixfmt'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30469 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:01:32 +00:00
diego
1e4bf6639e Add missing license header and multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30456 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 13:22:24 +00:00
reimar
2817539ee6 Try the more specific names first for the SwapInterval function to make it less
likely we get an incompatible one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30451 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-28 18:06:47 +00:00
reimar
6eb02e5c5e glXSwapIntervalEXT is defined to take different arguments from glXSwapIntervalSGI,
so do not try to use it.
Patch by Stephen Warren [swarren nvidia com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30450 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-28 18:01:19 +00:00
Uoti Urpala
42244dd2a4 x11_common: always free x11 context struct on exit
Previously it was not freed if no X11 display had been opened (for
example -vo null).
2010-01-28 01:12:34 +02:00
Uoti Urpala
4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
Uoti Urpala
69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
Uoti Urpala
47a04d40f3 Merge svn changes up to r30250 2010-01-25 14:34:56 +02:00
reimar
8277134a67 Change GUID declarations in vo_directx to be static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30343 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 11:43:55 +00:00
reimar
cbd5caef0e Add support for adjustable TV <-> PC level conversion.
This could also be done by modifying contrast and brightness, but
this seems a bit more flexible and easier to use.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30335 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:59:31 +00:00
reimar
c69a27ef8e Remove a check that simply can not have worked since it relied on a completely
uninitialized variable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30292 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-12 19:51:29 +00:00
reimar
74423218b7 Fix fbdev2 to work with Intel framebuffer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30249 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 11:32:18 +00:00
reimar
52e2d23da6 Fix vo_fbdev to also work with Intel framebuffer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30248 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 11:26:39 +00:00
Uoti Urpala
819b8f08a2 Merge svn changes up to r30236 2010-01-08 02:44:37 +02:00
Uoti Urpala
852570d342 Merge svn changes up to r30216 2010-01-08 02:39:39 +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
ff3ef4e782 vo_png: add missing "#include "fmt-conversion.h"
fmt-conversion.h is needed for imgfmt2pixfmt().
2010-01-08 01:55: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
231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02:00
diego
46206e2b28 vo_png now depends on libavcodec, not libpng.
patch by Emanuele Giaquinta, emanuele.giaquinta gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30225 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-05 10:52:12 +00:00
reimar
cec22660c7 Change license terms for matrixview to GPLv2 "or later", all known
authors have agreed to it, and current upstream (matrixgl.sourceforge.net)
was already relicensed as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30224 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-05 05:43:33 +00:00
diego
620ab70745 Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30208 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 19:04:33 +00:00
diego
ebe9682831 Remove unused variable; fixes the warning:
libvo/csputils.c:67: warning: unused variable 'yuv_tv_level_adjust'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30206 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 15:14:21 +00:00
diego
4ae9751ee6 Add missing license headers for vo_matrixview code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30203 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 13:05:52 +00:00
diego
55c7b19ae1 Refer to MatrixView instead of MPlayer in code taken from MatrixView.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30202 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 13:05:05 +00:00
reimar
36e760f9d9 Remove ARGB support from matrixview vo, it is quite pointless and causes
compilation failure on big-endian.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30198 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 11:58:56 +00:00