Commit Graph
3497 Commits
Author SHA1 Message Date
Uoti Urpala 8115fedc97 vo_gl: remove unused label 2010-11-02 04:14:43 +02:00
Uoti Urpala 26bd101530 x11_common.h: remove some unused declarations 2010-11-02 04:14:43 +02:00
cehoyos b3c3a40c6e vo_gl: remove "broken" comment from quadbuffer stereo
Independent tests indicate that GLX_STEREO is working fine on
supported hardware.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31647 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31648 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar 4e151f79e9 vo_gl: Some small whitespace and {} cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31639 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar 14d00a65e9 vo_gl: Try to get a quadbuffered visual for corresponding 3D mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31638 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar 42a8c42eb2 vo_gl: cleanup
Move declaration to where it is actually used.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31636 b3059339-0415-0410-9bf9-f77b7e298cf2

Use a more sensible variable name.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31637 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar ccb6675fbd vo_gl: Add initial stereo support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31633 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar 61ed4c2945 x11_common: Get window dimensions also for -wid 0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31623 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar efdce758ce x11_common.c: minor cleanup
Remove some commented-out code that has no purpose and is only confusing.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31620 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove useless ()

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31621 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar 4fc7f3b296 x11_common.c: Some indentation fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31602 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
reimar 1e159f4ecc x11_common: Do not try to grab input from -wid windows
It will most likely break their input processing.
If someone needs the previous behaviour, an option could be added (and
also used in the w32_common.c code).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31601 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix resizing with -wid after previous commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31604 b3059339-0415-0410-9bf9-f77b7e298cf2

Always request expose events, we have to handle them, the application
that created the -wid window can't.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31605 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
reimar 30d7c19b69 vo_gl: Fix -geometry with -wid behaviour (y position was flipped)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31600 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
diego 776c0f93f5 vo_mga: Rename libvo/mga_common.c --> libvo/mga_template.c
This file is not compiled but just #included and all other similar files
follow the naming scheme of having a "_template.c" suffix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31430 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:10:26 +02:00
reimar c107c484b6 vo_gl: More sensible behaviour for -geometry with -wid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31428 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:10:24 +02:00
diego ebbf5fb7a2 cosmetics: Remove some unused lines
Remove some unused extern declarations.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31424 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove an unused extern declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31425 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove commented-out forward declaration for removed function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31429 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unused extern fs_layer declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31435 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unused 'extern int vo_osd_changed_flag' declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31438 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:10:11 +02:00
reimar 82e546da0d x11_common: Consistently use "None" instead of "NULL" for X resources
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31422 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:10:10 +02:00
diego 49036138d0 ao_ivtv: Add header for ivtv_write() instead of forward declaring it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31419 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:09:18 +02:00
reimar ba6c59ddc5 SDL input: add missing 0-termination of keymap file
Fixes bug #1711.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31384 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
reimar be6a58d455 vo_gl, csputils: dual-license under LGPL v2.1
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
an alternative to the GPL license.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31375 b3059339-0415-0410-9bf9-f77b7e298cf2

Allow LGPL for csputils as well, they were previously part of gl_common
and are still an important part of it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31376 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
diego 9034d1b0ad libvo: Reduce verbosity of suboption parsing messages
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31353 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:28 +02:00
reimar 1a1e6e5a69 vo_gl: Remove nonsense commented-out function header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31340 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-10-27 20:31:20 +03:00
Uoti Urpala 7a669a6407 vo: improve fixed-vo behavior when video size changes in x11 VOs
Now the window is only resized when video size (or size specified by
-geometry) changes; reconfiguring the window with the same size no
longer changes back to default size from possibly user-modified one.

Also fix a bug in fullscreen handling that could cause incorrect
window size when turning fullscreen off.
2010-07-23 03:38:40 +03:00
Uoti Urpala dde8b753e4 Merge svn changes r31318 to r31328
r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...
2010-06-05 23:35:42 +03:00
Uoti Urpala 9ce39d6807 Merge svn change r31315 2010-06-05 23:23:18 +03:00
reimar 5377f6a0c3 Remove colorspace conversion code from -vo yuv4mpeg, -vf scale should
be able to handle this just as well (or better) including interlaced.
If not, this needs to be fixed there instead of duplicating code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31320 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:45:01 +00:00
reimar e22ebfddb1 Add support for -geometry x syntax since the documentation claims
it is supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31318 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:28:58 +00:00
reimar f0e84a0b23 Force window placement also if -xineramascreen was set >= 0,
not only if -geometry was given.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31315 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-04 17:10:38 +00:00
siretart 9e2e3a1cb8 apply missing bits from http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31314 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 21:50:08 +00:00
siretart d6d87593a7 vo_yuv4mpeg: disable RGB support when compiling against a shared libswscale
This avoids using swscale internals when compiling against a shared libswscale.

Patch inspired by Uoti Urpala's work in his git branch:
http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31310 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 17:37:58 +00:00
Uoti Urpala 80be936a56 Merge svn changes up to r31303 2010-06-02 19:12:01 +03:00
Uoti Urpala 497c32cdad Merge svn changes up to r31291 2010-06-02 18:55:18 +03:00
Uoti Urpala 5aa7c02984 Merge svn changes up to r31284 2010-06-02 17:59:10 +03:00
reimar 988b04eb2d Extend geometry parsing to reject all invalid strings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31302 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 20:12:58 +00:00
reimar e629ec20bc Factor out some common code and ensure we will not try to draw OSD
elements outside the streams and thus crash.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31297 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-31 21:24:00 +00:00
reimar 233c74254e Change code to let Window Manager chose window location by default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31289 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 19:14:18 +00:00
reimar 49c904b517 Treat a NULL renderer string as indication for software renderer.
Usually it means OpenGL will not work at all.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31284 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 13:51:24 +00:00
reimar f316f63910 Prefer -vo sdl over "probably software" OpenGL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31283 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 13:50:14 +00:00
Uoti Urpala 8ce2c41ca5 Merge svn changes up to r31226 2010-05-30 16:25:04 +03:00
Uoti Urpala 2f1a518d45 Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
2010-05-30 16:14:55 +03:00
Uoti Urpala e74361c488 Merge svn changes up to r31189 2010-05-30 15:51:33 +03:00
Uoti Urpala 6f199ab3d9 Merge svn changes up to r31169 2010-05-30 15:27:58 +03:00
Uoti Urpala 18657beb19 Merge svn changes up to r31145 2010-05-30 15:21:18 +03:00
Uoti Urpala 1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
diego bce7550929 misc cosmetics: K&R style nits, #include placement, indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31263 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:13:39 +00:00
Uoti Urpala 2e8ef70d4f vo_vdpau: fix loop initializing output surfaces as invalid
The loop initializing handles in the output surface table to
VDP_INVALID_HANDLE ran over indices from 0 to vc->num_output_surfaces.
However it is first called before that variable is initialized. As a
result later code could try to destroy the handles which still had the
"non-invalid" value 0. Most likely this caused no visible effects; at
least on my machine no valid surface gets handle 0, and libvdpau just
returns an error for the resulting invalid calls. Change the code to
loop over the whole table. Also add code to print visible warnings if
libvdpau rejects a surface destroy call (some other places already had
checks but not all).
2010-05-26 09:14:12 +03:00
diego 7bb3c3b681 Add missing RGB12 version of the fast OSD table.
patch by Janusz Krzysztofik, jkrzyszt tis.icnet pl


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31221 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-26 00:47:22 +00:00
reimar 25cb4330c9 Change -vo md5sum to not interleave U and V lines when calculating
the MD5, thus making it match FFmpeg's -f framemd5.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31208 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-24 17:51:15 +00:00
reimar 3009c1eff4 Fix OpenGL autodetection to not leave values at -1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31207 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-24 17:36:23 +00:00
reimar 7be96c3792 Do not return pointer to on-stack memory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31184 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 17:58:17 +00:00
reimar d08822aaac Fix return value (it was missing completely).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31183 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 17:55:39 +00:00