summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30463Uoti Urpala2010-03-092-1/+24
|\ | | | | | | | | | | 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.
| * Add missing license header and multiple inclusion guards.diego2010-01-301-0/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30456 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try the more specific names first for the SwapInterval function to make it lessreimar2010-01-281-1/+1
| | | | | | | | | | | | | | likely we get an incompatible one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30451 b3059339-0415-0410-9bf9-f77b7e298cf2
| * glXSwapIntervalEXT is defined to take different arguments from ↵reimar2010-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | 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
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-072-2/+2
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, 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.
* | build/vdpau: drop support for dynamic loading of libvdpauUoti Urpala2010-02-261-26/+2
| | | | | | | | | | | | | | | | | | | | 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.
* | vo_vdpau: improve VOCTRL_GET_EOSD_RES codeUoti Urpala2010-02-261-10/+4
| | | | | | | | | | | | | | | | 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.
* | vo_vdpau: make queuing future frame flips adjustableUoti Urpala2010-02-052-0/+10
| | | | | | | | | | | | | | | | | | | | 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).
* | VO: remove directfb from autoselected VOsUoti Urpala2010-01-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | 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.
* | x11_common: always free x11 context struct on exitUoti Urpala2010-01-281-7/+6
| | | | | | | | | | Previously it was not freed if no X11 display had been opened (for example -vo null).
* | Merge svn changes up to r30375Uoti Urpala2010-01-255-6/+36
|\|
| * Change GUID declarations in vo_directx to be static.reimar2010-01-171-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30343 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for adjustable TV <-> PC level conversion.reimar2010-01-164-4/+32
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r30301Uoti Urpala2010-01-251-2/+1
|\|
| * Remove a check that simply can not have worked since it relied on a completelyreimar2010-01-121-2/+1
| | | | | | | | | | | | | | uninitialized variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30292 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30250Uoti Urpala2010-01-252-6/+15
|\|
| * Fix fbdev2 to work with Intel framebuffer.reimar2010-01-091-2/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30249 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix vo_fbdev to also work with Intel framebuffer.reimar2010-01-091-4/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30248 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30236Uoti Urpala2010-01-082-3/+4
|\|
| * vo_png now depends on libavcodec, not libpng.diego2010-01-051-1/+1
| | | | | | | | | | | | | | patch by Emanuele Giaquinta, emanuele.giaquinta gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30225 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change license terms for matrixview to GPLv2 "or later", all knownreimar2010-01-051-2/+3
| | | | | | | | | | | | | | | | authors have agreed to it, and current upstream (matrixgl.sourceforge.net) was already relicensed as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30224 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30216Uoti Urpala2010-01-086-2/+40
|\|
| * Add missing header #includes to fix 'make checkheaders'.diego2010-01-042-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30208 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable; fixes the warning:diego2010-01-041-1/+0
| | | | | | | | | | | | | | libvo/csputils.c:67: warning: unused variable 'yuv_tv_level_adjust' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30206 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing license headers for vo_matrixview code.diego2010-01-042-0/+36
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30203 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Refer to MatrixView instead of MPlayer in code taken from MatrixView.diego2010-01-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30202 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30199Uoti Urpala2010-01-081-1/+0
|\|
| * Remove ARGB support from matrixview vo, it is quite pointless and causesreimar2010-01-041-1/+0
| | | | | | | | | | | | | | compilation failure on big-endian. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30198 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30195Uoti Urpala2010-01-088-76/+107
|\|
| * prettyprinting cosmeticsdiego2010-01-043-66/+71
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30195 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make vo gl print the OpenGL vendor and version strings.reimar2010-01-031-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30193 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).reimar2010-01-033-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30192 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid memleaks when vo_direct3d initialization fails.reimar2010-01-031-8/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30191 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Modify -vo direct3d so we do not have to link against d3d9.dll, it mightreimar2010-01-031-2/+19
| | | | | | | | | | | | | | | | not be available on some rare systems. Based on patch used for builds by Gianluigi Tiesi [sherpya netfarm it] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30190 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vo_png: add missing "#include "fmt-conversion.h"Uoti Urpala2010-01-081-0/+1
| | | | | | | | fmt-conversion.h is needed for imgfmt2pixfmt().
* | Merge svn changes up to r30187Uoti Urpala2010-01-081-115/+46
|\|
| * Change vo_png to use FFmpeg's png encoder instead of libpng.reimar2010-01-031-113/+44
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30186 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30185Uoti Urpala2010-01-0810-8/+1354
|\|
| * Finally add matrixview vo.reimar2010-01-035-0/+1315
| | | | | | | | | | | | | | | | Heavily cleaned up/fixed etc. by me, improvements are still possible though. Patch originally by Pigeon <pigeon at pigeond.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add pointers to a few more standard OpenGL functions to ease future extensions.reimar2010-01-032-0/+33
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30179 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fixup SDL configure check:reimar2010-01-031-0/+4
| | | | | | | | | | | | | | | | | | | | - Make it work without sdl-config which adds at least useless or even hurtful cflags and also does not work for cross-compiling - If using sdl-config, make it use the CFLAGS we actually use for compiling instead of something else. Thus #undef main is needed in the test program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not assume that "long" is the size of a register.reimar2010-01-032-8/+10
| | | | | | | | | | | | | | Fixes aclib compilation on mingw64 (with --enable-runtime-cpudetection). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30177 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Uoti Urpala2010-01-0814-206/+394
|\|
| * Simplify range-checking functions for subopt parsing.reimar2010-01-012-6/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30165 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix function declarations to avoid casting function pointers.reimar2010-01-0110-24/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly generalize code to generate YUV->RGB conversion table and addreimar2010-01-013-21/+37
| | | | | | | | | | | | | | XYZ->RGB conversion as an example for that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30163 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make YUV->RGB conversion coefficients selectable for -vo gl.reimar2010-01-011-1/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30161 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 16-bit per component YUV formats.reimar2009-12-313-5/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * First steps to supporting different YUV->RGB conversion definitions.reimar2009-12-314-10/+50
| | | | | | | | | | | | | | The numbers are possibly still wrong though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30151 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extract functions to generate yuv->rgb matrices and lookup tables into areimar2009-12-314-111/+168
| | | | | | | | | | | | | | separate file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Put the colourspace-related variables into a separate struct to easereimar2009-12-314-15/+20
| | | | | | | | | | | | | | extracting the code and sharing with other vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30149 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support all planar YUV formats in OpenGL vos.reimar2009-12-304-58/+97
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30139 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30136Uoti Urpala2009-12-303-34/+32
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Move do_render_osd function to avoid a forward declaration.reimar2009-12-271-32/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30126 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_x11_classhint name argument should be const, since we pass string ↵reimar2009-12-272-2/+2
| | | | | | | | | | | | constants there. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30125 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some ugly hacks to make compiling against a newer external version of libass ↵reimar2009-12-243-0/+3
| | | | | | | | | | | | work. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove more direct includes of libass/ass.hreimar2009-12-242-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30104Uoti Urpala2009-12-303-51/+66
|\| | | | | | | Ignore the broken correct-pts change in r30100.
| * Change %f to %e in generated fragment programs to avoid losing precision ↵reimar2009-12-201-26/+26
| | | | | | | | | | | | unnecessarily. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30078 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly improve vo_gl suboption documentation.reimar2009-12-191-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30075 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Define GL_GENERATE_MIPMAP ourselves if necessary.reimar2009-12-191-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30074 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for auto-generating mipmaps in vo_gl, should easereimar2009-12-191-3/+15
| | | | | | | | | | | | | | implementing anything that needs blur filters with large support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30072 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make -vo gl:customprog also work with RGB input (obviously those need to bereimar2009-12-191-17/+15