RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 21:12:23 +00:00
Code Issues Releases Wiki Activity
32,225 Commits 41 Branches 86 Tags 151 MiB
1605194717
Commit Graph

3521 Commits

Author SHA1 Message Date
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
reimar
55b3c6f090 Avoid very deep indentation level and RESET_GEOMETRY macro in -geometry 
parsing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30820 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-03 20:24:46 +00:00
diego
c106fe7751 Drop support for old-style DVB code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-02 19:57:17 +00:00
cehoyos
2acd36c48e Documentation: Add linebreak and try to be less ambiguous. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30800 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 17:39:30 +00:00
cehoyos
8271fc722b Remove unused static function send_lpcm_packet(). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30766 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 20:22:30 +00:00
reimar
84a962ebea Update -vo gl info structs, it isn't X11-only since ages and there's basically 
no code left from Arpi and it's unlikely the email address is still working anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30763 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 18:20:22 +00:00
reimar
5f32754c14 100l, remove forgotten debugging code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30762 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 18:17:33 +00:00
reimar
e92eaa0fd8 Only prefer -vo gl over -vo x11 if hardware acceleration is available. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30761 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 18:16:41 +00:00
reimar
05c24134de Enable StructureNotifyMask before waiting for a DestroyNotify event. 
Fixes hangs if OpenGL initialization fails in vo gl preinit and we
call uninit while the window is still hidden.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30760 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 17:55:57 +00:00
reimar
09cf021307 Port yuv=... auto-detection from gl to gl2. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30753 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-26 21:41:42 +00:00
diego
38b7648cac Mark character arrays as const. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30751 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-26 19:57:40 +00: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
diego
b63759b175 Do not cast the results of malloc/calloc/realloc. 
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-26 15:01:37 +00:00
reimar
e3e75ca066 Reorder vos: prioritize -vo gl above -vo x11 and -vo matrixview down with aa, caca etc. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30741 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 22:53:04 +00:00
diego
2074d1a3e7 Unconditionally declare fast_memcpy() and mem2agpcpy(). 
This fixes the following warnings on non-x86 systems:
libvo/aclib.c:162: warning: no previous prototype for 'fast_memcpy'
libvo/aclib.c:196: warning: no previous prototype for 'mem2agpcpy'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30728 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 13:20:56 +00:00
diego
36a14ac50c Declare externally used variables from vd.c as extern in vd.h. 
This saves declaring them as extern all over the place.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-22 09:51:44 +00:00
diego
b18b59b8d4 Add header for v4l2_write() instead of forward declaring it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30692 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 23:31:56 +00:00
diego
8ba6b4eaf9 cosmetics: Remove pointless empty lines at EOF. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 21:02:49 +00:00
diego
d306b727b1 Remove pointless '#if 1' preprocessor directives. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 10:22:29 +00:00
diego
eea4f2238b Add header for functions exported from vo_zr.c and use it appropriately. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30635 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-18 10:19:42 +00:00
reimar
50973f0044 Move struct typedef pixbuf into the only .c file where it is used. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30603 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-16 19:39:30 +00:00
reimar
0dc08a811d Remove useless malloc casts. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30602 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-16 19:36:36 +00:00
reimar
091e2a4313 Remove unused XPM-loading function pixbuf_load_xpm() from spuenc.c. 
Remove unused function pixbuf_delete() from spuenc.[ch].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30601 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-16 19:34:41 +00:00
diego
6833ea6ab2 libvo: Mark functions not used outside of their files as static. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30598 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-16 16:22:17 +00:00
reimar
676a0c121e Remove unused variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30589 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-14 18:50:32 +00:00
reimar
51cc80d2dd Use memset to initialize huge arrays. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30588 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-14 18:38:02 +00:00
reimar
687744dfed Remove pointless explicit member initialization to 0 when the struct 
is already zeroed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30587 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-14 18:32:31 +00:00
reimar
af356b5d15 Use calloc instead of malloc+memset 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30586 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-14 18:30:32 +00:00
diego
2e816f7a17 Add xscreensaver_heartbeat() declaration to x11_common.h. 
This avoids a forward declaration in mplayer.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30574 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-14 12:57:18 +00:00
diego
11b55ec7a8 Fix exit_player() usage throughout the codebase. 
exit_player() was declared with differing parameter types in mplayer.c and
mplayer.h. Make the declaration in the .h file match the one in the .c file
and adjust all usages of exit_player() throughout the codebase. Also move
the exit_player() declaration into mp_core.h next to exit_player_with_rc().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30558 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-14 10:53:20 +00: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