RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-29 15:00:27 +00:00
Code Issues Releases Wiki Activity
32,769 Commits 43 Branches 87 Tags 168 MiB
bdfdece245
Commit Graph

3585 Commits

Author SHA1 Message Date
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 cd4e8dc1fa 
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:
cd4e8dc1fa


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
reimar
f62044777b Handle -wid Window being closed for direct3d and gl vos on Windows. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31182 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-19 17:53:47 +00:00
reimar
5c74db3bf6 Quit MPlayer if we receive a DestroyNotify event. 
This in particular avoids MPlayer continuing to play when
a frontend using -wid crashed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31179 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-14 18:00:04 +00:00
Uoti Urpala
9e02b2db40 vo_vdpau: support queuing an arbitrary number of frames ahead 
Make the number of output surfaces allocated by vo_vdpau configurable
and allow queuing multiple future frames with the VDPAU frame timing
functionality. There are two known issues that could be polished in
the future for particularly long queue time cases. First, toplevel
code should possibly wait for the queued changes to finish displaying
in some situations like switching files. Second, the VO can block
waiting for a surface to become available, and in the worst case this
wait can be almost as long as the maximum queuing time (potentially
causing audio underruns). However those issues are not high priority.
 2010-05-14 05:55:09 +03:00
Uoti Urpala
67482de5a7 vo_vdpau: add option for studio level output 
Add -vo vdpau suboption "studio" to produce output in RGB range
16-235. Man page description mostly taken from a patch by Lauri
Mylläri (but not code). Also slightly tweak the description of two
other suboptions on the man page.
 2010-05-12 03:55:32 +03:00
astrange
9ac35085f5 Fix compilation with --disable-fastmemcpy on x86 
The inverse of a && b isn't !a && !b.
Regression in r30728.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31154 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-11 09:23:31 +00:00
Uoti Urpala
0ae292fbcb vdpau: drop support for old versions 
Since I dropped the hack to support older libvdpau versions (without
MPEG4 / hqscaling features) from the FFmpeg version used in the build
repo it's better to disable those libvdpau versions in MPlayer
too. Change the configure check to require a newer libvdpau version,
and drop compatibility code in vo_vdpau.c.
 2010-05-11 04:07:31 +03:00
reimar
a7eab84efa Default to rectangle=1 on Mesa DRI R200 drivers, much faster and less buggy. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31151 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-09 21:36:10 +00:00
reimar
89957c3f6a Minor code cleanup. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31150 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-09 21:29:21 +00:00
reimar
c9123e5a2d yuv=5 supports brightness and contrast adjustment. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31149 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-09 21:25:38 +00:00
reimar
6f28f44c8c Handle chroma texture size becoming 0, e.g. due to bad rounding. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31143 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-09 00:16:46 +00:00
Uoti Urpala
e1cd86076f Merge svn changes up to r31141 2010-05-07 22:13:35 +03:00
Uoti Urpala
eee666c3b5 Merge svn changes up to r31133 2010-05-07 21:19:53 +03:00
Uoti Urpala
033e479bec Merge svn changes up to r31104 2010-05-07 21:02:42 +03:00
Uoti Urpala
a817e69131 Merge svn changes up to r31100 2010-05-07 20:59:01 +03:00
cehoyos
02641f54ee Add support for 12-bit color mode on framebuffer devices. 
Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-06 10:18:25 +00:00
Uoti Urpala
fa47d009b4 vo_vdpau.c cosmetics: add WRAP_ADD macro 
The macro is meant to simplify the handling of some code dealing with
circular buffers.
 2010-05-06 05:38:46 +03:00
reimar
fa6239aea0 Also print OpenGL renderer string with vendor and version with -v 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31127 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-01 22:49:05 +00:00
reimar
9d3c096045 Avoid duplicating the GL/gl.h include. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31107 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-30 19:03:13 +00:00
reimar
ce4d38385c 100l, open the customtex also in binary mode, not just the program. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31106 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-30 17:12:52 +00:00
reimar
46f3b7d263 Move variable declaration into the block where it is actually used. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31103 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-27 19:04:23 +00:00
diego
f15a14c158 Add missing input.h #include, fixes the warnings: 
libvo/video_out.c:461: warning: implicit declaration of function 'mp_input_queue_cmd'
libvo/video_out.c:461: warning: implicit declaration of function 'mp_input_parse_cmd'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31101 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-27 15:17:49 +00:00
diego
04d20b550d Move "screen" variable declaration below the relevant #ifdef, fixes the warning: 
libvo/x11_common.c:369: warning: unused variable 'screen'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31100 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-27 15:16:42 +00:00
Uoti Urpala
f38efd166e Merge svn changes up to r31097 2010-04-26 19:23:32 +03:00
Uoti Urpala
8df340271e Merge svn changes up to r31040 2010-04-26 18:38:11 +03:00
Uoti Urpala
7795726e0f Merge svn changes up to r31033 2010-04-26 18:25:34 +03:00
Uoti Urpala
837c48ddee Merge svn changes up to r31020 2010-04-26 18:06:00 +03:00
Uoti Urpala
e913d6c5da Merge svn changes up to r31004 2010-04-26 17:55:05 +03:00
Uoti Urpala
4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
Uoti Urpala
ff559b8e90 Merge svn changes up to r30907 2010-04-26 16:57:25 +03:00
Uoti Urpala
b1372a4f56 cosmetics: mark sub.c:osd_update_ext() static 2010-04-25 22:57:49 +03:00
reimar
7da954855a Set vo_dwidth/vo_dheight for mouse movements work at least in windowed mode. 
For fullscreen, vo_screenwidth/vo_screenheight have to be set correctly still.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31095 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 16:48:48 +00:00
reimar
af7e76c80b Missing space after if. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31093 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 16:20:54 +00:00
reimar
3d2259d365 Support mouse movements in SDL. 
Currently for some reason broken with -vo sdl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31092 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 16:15:00 +00:00
reimar
14c018a80f Avoid duplicating mouse-movement command-generation code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 16:13:57 +00:00
reimar
2f629d7969 Deduplicate enable_mouse_movements declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31089 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 15:49:46 +00:00
reimar
07a9a495c8 Minor cosmetics. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31088 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 15:41:21 +00:00
reimar
f189c8286a Add comment for endif. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31087 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 15:39:22 +00:00
reimar
a9ff7793e3 Support for auto-selecting the OpenGL backend. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31086 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 10:53:01 +00:00
reimar
3a34dbc927 Add reinitialization support. Necessary for fullscreen on OSX. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 10:44:53 +00:00
reimar
4121ce1747 Handle SDL expose events with -vo gl. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31084 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 10:34:58 +00:00
reimar
63c3c67294 Missing space in error message. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31083 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 10:12:39 +00:00
reimar
2d8e13c4ea Simplify SDL key symbol mapping. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31082 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 10:09:01 +00:00
reimar
b2d0096783 Use the proper define for translating the tab key. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31081 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 09:59:43 +00:00
reimar
12d11bbd3a Make uppercase characters and in general all ASCII characters work 
properly with SDL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31080 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 09:57:52 +00:00
reimar
9661a675e5 Share SDL initialization code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31079 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 09:52:01 +00:00
reimar
e0183c56b1 Remove unnecessary check. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31078 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 09:25:23 +00:00
reimar
25b9185f17 Fullscreen support for -vo gl using SDL. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31077 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 09:24:30 +00:00
reimar
8b8fd879ac Set SDL window title. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31076 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 08:40:28 +00:00
reimar
a83117e972 Window resizing support for -vo gl with SDL backend. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31075 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 08:35:35 +00:00
reimar
7c2bef4bb5 Add sdl_common file and use it to share the input handling between -vo gl 
with SDL backend and -vo sdl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31074 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 08:17:23 +00:00
reimar
5cdca55005 Use SDL_GL_ProcAddress to work around conflicts between -lGL 
and -framework OpenGL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31073 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 07:32:42 +00:00
reimar
7fc3b782ea Update copyright and email address. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31072 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 06:52:13 +00:00
reimar
56af15374b Clarify that the GL_TEXT_FRAGMENT_SHADER_ATI bug workaround is for OSX, 
and which versions are known good/known bad.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31071 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 06:14:25 +00:00
reimar
e9ef1cbda0 Missing gl.h include for SDL backend. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31070 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 22:35:39 +00:00
reimar
37da18aaf9 Slightly more correct ifdefs for vo_gl2. 
Compiling with both win32 and x11 backend still will not work though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31069 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 22:34:38 +00:00
reimar
f81cd34fe0 Add workaroound for yuv=7 mode - does hurt speed but not much 
and this code should only be used when it is the only option.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31068 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 22:13:57 +00:00
reimar
d5d3c203d3 Remove code to work around bugs in ancient libSDL versions, the code has been 
accidentally disabled since some time and there were no complaints.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31067 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 17:15:28 +00:00
reimar
ccc269a00a Try harder to find linked OpenGL functions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31066 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 17:02:50 +00:00
reimar
5c4cc997ca Disable OSD support by default if the necessary OpenGL functionality is missing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31065 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 16:58:24 +00:00
reimar
abfa4e2ae9 SDL support with related crash-resilience fixes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31064 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 16:52:06 +00:00
reimar
29e713ba4b Some crash-resilience fixes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31063 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 16:49:46 +00:00
reimar
6e4458ffa3 First steps to support -vo gl with SDL-based Window handling. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31062 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 16:46:47 +00:00
diego
976d35bc6b 10l: Remove leftover commented-out #include. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31061 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 10:50:21 +00:00
diego
ca555e249f Remove unnecessary kd.h #include. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31060 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 10:47:53 +00:00
siretart
9cef48bac7 rename 'struct keymap' -> 'struct mp_keymap' 
This avoids the compilation failure on kFreeBSD (at least amd64):

  In file included from libvo/vo_directfb2.c:44:
  libvo/video_out.h:267: error: redefinition of 'struct keymap'

This is because libvo/vo_directfb2.c #includes sys/kd.h, which in turn
includes sys/kbio.h, which defines another 'struct keymap'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31059 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-23 10:22:44 +00:00
siretart
8bd8aba37a include sys/kd.h on non-Linux architectures correctly 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31058 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-23 10:04:56 +00:00
reimar
3158a326fe Open cutomtex file in binary mode to avoid potential issues on 
Windows.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31036 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-13 05:54:44 +00:00
reimar
8305385bb7 Add some fallback OpenGL defines to fix compilation on Windows. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31027 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-07 19:36:23 +00:00
reimar
a55acacbda Fix RGB support for corevideo: corevideo can only support 
ARGB and BGRA, which depending on endianness matches only one
of RGB32 and BGR32.
Also add RGB24 support which works independent of endianness,


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31016 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 13:11:06 +00:00
reimar
c0b8b92d99 Enable OSD also for BGR32, the code is the same as for RGB32. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31015 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 07:22:21 +00:00
reimar
a8a98ee6d1 Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoiding 
an extra memcpy in case of stride mismatch.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31014 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 07:15:22 +00:00
reimar
e6455d7161 Check texture dimensions instead of internal format in max texture 
size check to work around OS X ATI driver bugs:
- does not keep format but use an equivalent one (1 becomes 0x8040).
- does not set to 0 on failure but to 0x8018


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31013 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:56:26 +00:00
reimar
3107620451 Cosmetics/reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31012 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:44:03 +00:00
reimar
1a42a53fd2 Avoid duplicating a condition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31011 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:42:52 +00:00
reimar
5e8cfc7230 Print width before height, 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31010 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:39:54 +00:00
reimar
475a831ac8 Fix width/height mixup in error message. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31009 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:38:47 +00:00
reimar
b8a7ed8a79 Factor out the YUV->RGB conversion auto-selection and also 
enable auto-selection of ATI fragment shaders since they
should do accurate conversions now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31006 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 16:56:30 +00:00
diego
d2d509dc39 Mark dxr2_opts array as const. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30998 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 16:08:15 +00:00
reimar
22f6170009 Share more code between the two ATI fragment shader YUV to RGB 
conversion methods and extend them to support more accurate
conversion (though at the cost of some speed).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30995 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 11:45:05 +00:00
reimar
4a8486f844 Try to detect and work around broken glXGetProcAddress on at 
least PPC OS X 10.4.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30994 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 20:31:03 +00:00
reimar
269b96d75e Implement OpenGL-based YUV to RGB version for Radeon 9200 class 
cards on OS X.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30993 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 19:58:06 +00:00
reimar
0c6b8880ce Indentation fix. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30988 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 07:12:32 +00:00
reimar
2cebf8eeb7 Add mpgl prefix to all OpenGL-related function pointers. 
This is necessary because at least the GetString symbol
causes clashes on PPC OSX 10.4, causing -vo gl to always
crash.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30987 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 07:08:07 +00:00
diego
86641ee41e Use (void) instead of () to indicate a parameterless function, fixes: 
libvo/vo_xvmc.c:123: warning: function declaration isn't a prototype


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30975 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-28 16:58:27 +00:00
reimar
1641daf014 Add const to some video_out extern declarations to match their definitions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30968 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-27 15:27:16 +00:00
reimar
38abe6ff7a Mark some more LIBVO_EXTERN declarations as const where possible. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30967 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-27 15:22:47 +00:00
diego
3e7a2bd8c3 Refactor OS X foreground process setting into a separate function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30964 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-26 15:02:14 +00:00
diego
70c66c0476 Rename get_path.[ch] --> path.[ch]. 
These files now contain different functions related to path handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-20 23:38:27 +00:00
reimar
e0c5806d44 Add newlines to generated fragment program to make both fragment program dump 
with -v more readable and compiler error message more understandable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30882 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-12 17:21:05 +00:00
Uoti Urpala
00323c06e2 Delete things related to old translation system 
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
 2010-03-10 03:47:14 +02:00
Uoti Urpala
0269d22d32 Merge svn changes up to r30876 2010-03-10 03:18:42 +02:00
Uoti Urpala
240550bbb9 Merge svn changes up to r30848 2010-03-10 03:00:14 +02:00
Uoti Urpala
bc1d0ca37d Merge svn changes up to r30798 2010-03-10 02:35:02 +02:00
Uoti Urpala
e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala
acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
Uoti Urpala
0dce155dd3 Merge svn changes up to r30694 2010-03-10 01:01:15 +02:00
Uoti Urpala
90f5873f1a Merge svn changes up to r30675 2010-03-10 00:47:25 +02:00
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
c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala
89c5ed5e9a Merge svn changes up to r30605 2010-03-09 23:44:57 +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
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
reimar
7f0c959ddc Use FBIOPAN_DISPLAY for switching between pages, seems to work for more 
drivers and can be much faster.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30859 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-07 17:33:13 +00:00
reimar
16ec3a5a8a Add double-buffering support to vo_fbdev. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30858 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-07 15:55:52 +00:00
reimar
7852aff0c4 Reuse fb_tty_fd for setting up the text area. 
This avoids the fopen call which could end up creating a /dev/tty file
if it did not exist.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30846 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-05 20:15:16 +00:00
reimar
baae4d1add Save the new width and height earlier so that e.g. -geometry 30x30-50-50 
gives the correct behaviour - before placement would depend on the
original movie size instead of the one scaled according to -geometry.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30823 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-03 21:01:57 +00:00
reimar
90188f0e5f Add support for specifying window position relative to right and bottom 
screen borders with -geometry.
Based on patch by Melchior FRANZ [melchior franz gmail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30822 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-03 20:57:56 +00:00
reimar
0833aaa64d Simplify sscanf format strings and get rid of useless percent variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30821 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-03 20:36:35 +00:00