RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-29 18:42:09 +00:00
Code Issues Releases Wiki Activity
31,067 Commits 41 Branches 86 Tags 147 MiB
39fbfa0321
Commit Graph

31067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
reimar
39fbfa0321 Add configure detection for SDL backend for -vo gl. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31108 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-30 19:04:13 +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
cehoyos
992e2d666f Fix compilation with gcc 2.95.3 (with --disable-ass). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31105 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-28 11:57:09 +00:00
iive
3517a9b72b New hack for vobsub packet merging. 
It seems that if there is no padding between packets then they actually belong to one subtitle picture.
The new hack seems to work far more reliable than the (already removed) old one.
Patch by Ubitux (gmail)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31104 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-27 22:06:29 +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
eca4b87376 Add llrintf test for FFmpeg. 
patch by Michael Kostylev, michael.kostylev gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31102 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-27 17:50:50 +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
Gabrov
c5a3a6d35d fix typo 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31099 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-27 13:33:29 +00:00
cehoyos
727f4b2b8a Fix compilation with live555 after libavutil r22965. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31098 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-27 08:19:42 +00:00
Gabrov
4e853e19ef synced with r31096 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31097 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 20:05:22 +00:00
Gabrov
c9c728034e typo fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31096 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 19:58:43 +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
12c9fa73f3 Try other methods also if GetBusKey fails instead of failing completely. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31094 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 16:39:39 +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
38505822c7 Fix crash if a DVD is played with dvdnav:// and without video 
(e.g. because vo initialization failed).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31090 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 16:09:56 +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