summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28103Uoti Urpala2008-12-064-15/+84
|\
| * 10l, add forgotten a #ifndef GL_WIN32, fixes win32 builds.reimar2008-12-051-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28103 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix indentationreimar2008-12-051-12/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28102 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add experimental support for glXAllocateMemoryMESAreimar2008-12-053-5/+33
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28101 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid one more duplicated logic.reimar2008-12-051-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28099 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify, do not duplicate buffer size calculationreimar2008-12-051-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28098 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set the base size window manager hint, otherwise some subtract the minimumreimar2008-12-051-0/+7
| | | | | | | | | | | | | | | | size of 4x4 from the numbers displayed to the user which might be confusing. Based on patch by Bert Wesarg [bert wesarg googlemail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28097 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add some forgotten documentation for gl suboptionsreimar2008-12-051-1/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28094 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for YCBCR MESA texture format to vo_gl.reimar2008-12-053-0/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28093 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-0414-63/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-0312-33/+33
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused declarations and references to vo_draw_text_osd(),diego2008-12-033-16/+1
| | | | | | | | | | | | | | vo_draw_text_progbar(), vo_draw_text_sub(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix indentation.reimar2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28076 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More robust w32 -wid size handlingreimar2008-12-031-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28074 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindent after previous commitreimar2008-12-031-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28073 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not override the vo_dwidth/vo_dheight values in vo_w32_configreimar2008-12-031-0/+3
| | | | | | | | | | | | | | in -wid mode because we ignore the requested size in that case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28072 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics, whitespace and "... == NULL" to "!..."reimar2008-12-031-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28070 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some whitespace and () cosmeticsreimar2008-12-031-17/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28069 b3059339-0415-0410-9bf9-f77b7e298cf2
* | w32_common.c, vo_direct3d.c: Fix Windows compilation issuesUoti Urpala2008-12-022-3/+3
| | | | | | | | | | | | In w32_common.c the special "old_vo_defines.h" header was included too late. vo_direct3d.c was copied from svn without fixing the type of the control() function.
* | Merge svn changes up to r28065Uoti Urpala2008-12-024-200/+287
|\|
| * Remove resize_d3d call from render_d3d_frame that was made uselessreimar2008-12-021-2/+0
| | | | | | | | | | | | | | | | | | by previous commit. If this is necessary e.g. to prevent flicker while resizing, check_events should be called instead or even better the functionality be moved to some higher layer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28065 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, do not call check_events from resize_d3d since there should bereimar2008-12-021-3/+0
| | | | | | | | | | | | | | | | no reason to do it and it might call resize_d3d again which makes it hard to guarantee that it works correctly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28064 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: Remove unnecessary ()reimar2008-12-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28063 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Consistency cosmetics: do not compare against NULL in ifsreimar2008-12-021-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28062 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: remove spaces before argument (reimar2008-12-021-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28061 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reorganize Direct3D initialization code.reimar2008-12-021-51/+150
| | | | | | | | | | | | | | Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28060 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a lot of completely pointless mp_msg_test calls.reimar2008-12-011-53/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28055 b3059339-0415-0410-9bf9-f77b7e298cf2
| * use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>nplourde2008-11-301-17/+32
| | | | | | | | | | | | | | | | | | Original thread: date: Sun, Oct 12, 2008 at 10:32 PM subject: [MPlayer-dev-eng] [PATCH] vo_macosx: use mmap instead of shmat for MPlayerOSX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28050 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: prettyprinting and indentationdiego2008-11-281-77/+81
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28045 b3059339-0415-0410-9bf9-f77b7e298cf2
| * factorize mouse hiding and screensaver disabling codegpoirier2008-11-272-10/+11
| | | | | | | | | | | | | | | | | | | | Based on the patch posted in thread: from Gregor Riepl %onitake A gmail P com% date: Wed, Oct 29, 2008 at 7:26 PM subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28044 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28043Uoti Urpala2008-11-261-2/+8
|\|
| * Use D3DFMT_ constants where possible instead of MAKEFOURCCreimar2008-11-261-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28041 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for RGB formats to vo_direct3dreimar2008-11-261-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28040 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28038Uoti Urpala2008-11-259-2474/+2392
|\|
| * 100l, OSD alpha textures were cleared to the wrong value.reimar2008-11-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28036 b3059339-0415-0410-9bf9-f77b7e298cf2
| * typo fix + readability improvementgpoirier2008-11-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28035 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary #ifdef around a struct and a bunch of extern declarations.diego2008-11-241-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28031 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not initialize fb_dev_fd to -1, similar to vo_fbdev.c.diego2008-11-241-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28028 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Add/remove a few newlines similar to vo_fbdev.c.diego2008-11-241-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28027 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics (svn diff --diff-cmd diff -x '-duwbBE' gives no differences)gpoirier2008-11-241-1186/+1189
| | | | | | | | | | | | | | | | replace tabs by 4 spaces. prettier intentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28026 b3059339-0415-0410-9bf9-f77b7e298cf2
| * avoid putting several statements on a single linegpoirier2008-11-241-9/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28025 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use doxygen-style comments in file header. Remove tabs usage.gpoirier2008-11-241-12/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28024 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace-cleanupgpoirier2008-11-241-175/+175
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28023 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow vo_macosx to be compiled in 64-bits mode:gpoirier2008-11-241-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace usage of undocumented Apple function CPSEnableForegroundOperation() (which is available in 32-bits mode, but not in 64-bits mode) by TransformProcessType() which is public, documented, and available since OSX 10.3. - Work around Apple bug #6267445 since OSServices Power API is diabled in 64-bits systems Based on patch by Gregor Riepl %onitake A gmail P com% posted in thread: date: Fri, Oct 3, 2008 at 4:49 PM subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28022 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer ↵reimar2008-11-241-0/+40
| | | | | | | | | | | | offsets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28021 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace QuickDraw calls in vo_quartz.c to fix warnings when compiling with ↵gpoirier2008-11-241-69/+96
| | | | | | | | | | | | | | | | | | | | | | | | current SDK versions. Patch by Gregor Riepl %onitake A gmail P com% Original thread: Date: Wed, Oct 29, 2008 at 7:26 PM Subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28020 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a ColorFill that is not necessary since the surface it is usedreimar2008-11-241-4/+0
| | | | | | | | | | | | | | | | on has exactly the same size as the video image and the video will be copied into it before it is used the first time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28019 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure the backbuffer is cleared when the border size might have changed.reimar2008-11-241-1/+14
| | | | | | | | | | | | | | Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28018 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless setting of frame_buffer to NULL as suggested by Reimar.diego2008-11-242-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28017 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: indentationdiego2008-11-241-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28016 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move setting of frame_buffer variable out of 'if', as preferred by Reimar.diego2008-11-242-4/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28015 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Clear the whole window on resize in vo_x11 since we do notreimar2008-11-231-1/+3
| | | | | | | | | | | | | | yet know how large the borders will be. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28011 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify vo_x11 check_events functionreimar2008-11-231-7/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28010 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not draw in window if our image has not yet been adjusted to the new ↵reimar2008-11-231-0/+5
| | | | | | | | | | | | | | | | | | | | window size. Fixes some cases of borders not being black in fullscreen when fullscreen image is scaled down. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28009 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary xf86vmode.h include.reimar2008-11-231-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28008 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove some usnused variables and commented-out code.reimar2008-11-231-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28007 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.reimar2008-11-231-9/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28006 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Patch to improve/consistify coding style.reimar2008-11-231-20/+20
| | | | | | | | | | | | | | Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28005 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix indentationreimar2008-11-231-12/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28004 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Lock/unlock surface only once even when drawing many slices.reimar2008-11-231-7/+14
| | | | | | | | | | | | | | Patch originally by Jim Hauxwell [james dattrax co.uk] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28003 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move locked_rect from stack to priv struct in preparation for following patch.reimar2008-11-231-17/+13