summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* x11_common: Get window dimensions also for -wid 0reimar2010-11-021-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31623 b3059339-0415-0410-9bf9-f77b7e298cf2
* x11_common.c: minor cleanupreimar2010-11-021-3/+1
| | | | | | | | | | Remove some commented-out code that has no purpose and is only confusing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31620 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove useless () git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31621 b3059339-0415-0410-9bf9-f77b7e298cf2
* x11_common.c: Some indentation fixesreimar2010-11-021-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31602 b3059339-0415-0410-9bf9-f77b7e298cf2
* x11_common: Do not try to grab input from -wid windowsreimar2010-11-021-8/+21
| | | | | | | | | | | | | | | | | It will most likely break their input processing. If someone needs the previous behaviour, an option could be added (and also used in the w32_common.c code). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31601 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix resizing with -wid after previous commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31604 b3059339-0415-0410-9bf9-f77b7e298cf2 Always request expose events, we have to handle them, the application that created the -wid window can't. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31605 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Fix -geometry with -wid behaviour (y position was flipped)reimar2010-11-021-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31600 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_mga: Rename libvo/mga_common.c --> libvo/mga_template.cdiego2010-11-023-2/+2
| | | | | | | 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
* vo_gl: More sensible behaviour for -geometry with -widreimar2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31428 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove some unused linesdiego2010-11-022-4/+0
| | | | | | | | | | | | | | | | | | | | | | 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
* x11_common: Consistently use "None" instead of "NULL" for X resourcesreimar2010-11-021-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31422 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_ivtv: Add header for ivtv_write() instead of forward declaring itdiego2010-11-022-0/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31419 b3059339-0415-0410-9bf9-f77b7e298cf2
* SDL input: add missing 0-termination of keymap filereimar2010-11-021-0/+1
| | | | | | Fixes bug #1711. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31384 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl, csputils: dual-license under LGPL v2.1reimar2010-11-025-0/+25
| | | | | | | | | | | | 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
* libvo: Reduce verbosity of suboption parsing messagesdiego2010-11-023-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31353 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Remove nonsense commented-out function headerreimar2010-10-271-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31340 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo: improve fixed-vo behavior when video size changes in x11 VOsUoti Urpala2010-07-232-0/+26
| | | | | | | | | 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.
* Merge svn changes r31318 to r31328Uoti Urpala2010-06-052-269/+6
|\ | | | | | | | | r31328 is a somewhat questionable (changing the option at that point isn't quite safe), but it was a failure case already...
| * Remove colorspace conversion code from -vo yuv4mpeg, -vf scale shouldreimar2010-06-051-268/+2
| | | | | | | | | | | | | | | | 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
| * Add support for -geometry x syntax since the documentation claimsreimar2010-06-051-1/+4
| | | | | | | | | | | | | | it is supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31318 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn change r31315Uoti Urpala2010-06-051-0/+1
|\|
| * Force window placement also if -xineramascreen was set >= 0,reimar2010-06-041-0/+1
| | | | | | | | | | | | | | not only if -geometry was given. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31315 b3059339-0415-0410-9bf9-f77b7e298cf2
| * apply missing bits from ↵siretart2010-06-031-0/+6
| | | | | | | | | | | | http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31314 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_yuv4mpeg: disable RGB support when compiling against a shared libswscalesiretart2010-06-031-4/+10
| | | | | | | | | | | | | | | | | | | | This avoids using swscale internals when compiling against a shared libswscale. Patch inspired by Uoti Urpala's work in his git branch: http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31310 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31303Uoti Urpala2010-06-022-15/+26
|\|
| * Extend geometry parsing to reject all invalid strings.reimar2010-06-011-9/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31302 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor out some common code and ensure we will not try to draw OSDreimar2010-05-311-3/+12
| | | | | | | | | | | | | | elements outside the streams and thus crash. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31297 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31291Uoti Urpala2010-06-021-1/+5
|\|
| * Change code to let Window Manager chose window location by default.reimar2010-05-301-1/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31289 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31284Uoti Urpala2010-06-022-4/+4
|\|
| * Treat a NULL renderer string as indication for software renderer.reimar2010-05-301-1/+1
| | | | | | | | | | | | | | Usually it means OpenGL will not work at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31284 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Prefer -vo sdl over "probably software" OpenGL.reimar2010-05-301-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31283 b3059339-0415-0410-9bf9-f77b7e298cf2
| * misc cosmetics: K&R style nits, #include placement, indentationdiego2010-05-291-72/+71
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31263 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31226Uoti Urpala2010-05-301-0/+2
|\|
| * Add missing RGB12 version of the fast OSD table.diego2010-05-261-0/+2
| | | | | | | | | | | | | | patch by Janusz Krzysztofik, jkrzyszt tis.icnet pl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31221 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31211Uoti Urpala2010-05-302-5/+14
|\| | | | | | | | | The merged cache2.c changes are known to have problems. Will merge further fixes to them before merging this to the master branch.
| * Change -vo md5sum to not interleave U and V lines when calculatingreimar2010-05-241-0/+2
| | | | | | | | | | | | | | 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
| * Fix OpenGL autodetection to not leave values at -1.reimar2010-05-241-5/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31207 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31189Uoti Urpala2010-05-302-6/+16
|\|
| * Do not return pointer to on-stack memory.reimar2010-05-191-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31184 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix return value (it was missing completely).reimar2010-05-191-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31183 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle -wid Window being closed for direct3d and gl vos on Windows.reimar2010-05-191-4/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31182 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Quit MPlayer if we receive a DestroyNotify event.reimar2010-05-141-0/+4
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r31169Uoti Urpala2010-05-302-6/+8
|\|
| * Fix compilation with --disable-fastmemcpy on x86astrange2010-05-111-1/+1
| | | | | | | | | | | | | | | | 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
| * Default to rectangle=1 on Mesa DRI R200 drivers, much faster and less buggy.reimar2010-05-091-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31151 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Minor code cleanup.reimar2010-05-091-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31150 b3059339-0415-0410-9bf9-f77b7e298cf2
| * yuv=5 supports brightness and contrast adjustment.reimar2010-05-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31149 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31145Uoti Urpala2010-05-301-1/+6
|\|
| * Handle chroma texture size becoming 0, e.g. due to bad rounding.reimar2010-05-091-1/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31143 b3059339-0415-0410-9bf9-f77b7e298cf2
* | cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Uoti Urpala2010-05-291-1/+2
| | | | | | | | | | | | | | Change 'struct vf_instance' pointer arguments to more standard style as in the subject. Also some other minor formatting fixes. Patch by Diego Biurrun.
* | vo_vdpau: fix loop initializing output surfaces as invalidUoti Urpala2010-05-261-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | vo_vdpau: support queuing an arbitrary number of frames aheadUoti Urpala2010-05-141-37/+56
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | vo_vdpau: add option for studio level outputUoti Urpala2010-05-121-0/+15
| | | | | | | | | | | | | | 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.
* | vdpau: drop support for old versionsUoti Urpala2010-05-111-5/+0
| | | | | | | | | | | | | | | | 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.
* | Merge svn changes up to r31141Uoti Urpala2010-05-075-1/+74
|\|
| * Add support for 12-bit color mode on framebuffer devices.cehoyos2010-05-065-1/+74
| | | | | | | | | | | | | | Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31133Uoti Urpala2010-05-072-6/+3
|\|
| * Also print OpenGL renderer string with vendor and version with -vreimar2010-05-011-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31127 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid duplicating the GL/gl.h include.reimar2010-04-301-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31107 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, open the customtex also in binary mode, not just the program.reimar2010-04-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31106 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31104Uoti Urpala2010-05-071-2/+2
|\|
| * Move variable declaration into the block where it is actually used.reimar2010-04-271-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31103 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing input.h #include, fixes the warnings:diego2010-04-271-1/+1
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r31100Uoti Urpala2010-05-071-1/+1
|\|
| * Move "screen" variable declaration below the relevant #ifdef, fixes the warning:diego2010-04-271-1/+1
| | | |