1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-24 12:24:21 +00:00
Commit Graph

3221 Commits

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