summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pause'Uoti Urpala2009-01-153-279/+300
|\
| * vo_gl: Support changing OSD over existing frameUoti Urpala2009-01-141-0/+6
| |
| * vo_xv: Always support updating OSD if none was drawn yetUoti Urpala2008-12-101-4/+19
| | | | | | | | | | | | | | If the main image buffer was not altered for OSD then allow updating OSD even if no separate OSD-less copy was made. The code now makes a copy at that time (another possibility would be to not make a copy and disallow further updates).
| * Update OSD while pausedUoti Urpala2008-12-092-15/+62
| | | | | | | | | | | | | | | | | | | | | | | | When OSD contents change while paused, try to change the OSD drawn in the currently visible frame. If such OSD updates are not supported then advance by one frame and draw the OSD normally. Add some support for OSD redrawing to vo xv. The new xv code makes a copy of the original frame contents before drawing the OSD if MPlayer is already paused when the frame is drawn. If such a copy of the current frame exists then the frame contents can be restored and a different OSD drawn on top of the same frame.
| * vo_xv: Reformat codeUoti Urpala2008-12-091-268/+221
| | | | | | | | | | Reformat vo_xv.c completely to K & R style and remove a couple of outdated comments.
* | Merge svn changes up to r28204Uoti Urpala2008-12-273-3/+23
|\ \
| * | Fix ugly borders problem with ati-hackreimar2008-12-271-0/+19
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28199 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Remove unused variable.diego2008-12-241-1/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28191 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Warn when using features that are broken due to ATI driver bugs.reimar2008-12-231-0/+3
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28188 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Do not default to rectangle=2, it is at least for ATI HD4850 cards with 8.12 ↵reimar2008-12-231-1/+1
| | | | | | | | | | | | | | | | | | drivers 20% slower at HD resolutions git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28187 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Remove pointless forward declaration.diego2008-12-231-1/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28184 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Merge svn changes up to r28176Uoti Urpala2008-12-226-428/+146
|\| | | | | | | | | | | | | | | | | Conflicts: libvo/video_out.c libvo/x11_common.c
| * | 100l, forgot an assignment, broke special keys handling for X11-based vos.reimar2008-12-211-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28175 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add and use a special lookup function to do table-based translation to ↵reimar2008-12-204-55/+49
| | | | | | | | | | | | | | | | | | MPlayer keycodes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28172 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Cosmetics: get rid of some tabs and trailing whitespace.reimar2008-12-201-32/+32
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28171 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Use a table to translate X11 to MPlayer keycodes.reimar2008-12-201-145/+46
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28170 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Get rid of pointless and now unused defines.reimar2008-12-201-88/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28169 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Simplify handling of X11 key events that are just passed through.reimar2008-12-201-97/+7
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28168 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Replace vo_macosx's custom options parsing with a subopt_parse()-based onegpoirier2008-12-191-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (in the same way as vo_gl). Patch by Adrian Stutz %adrian A sttz P ch% Original thread: date: Tue, Dec 9, 2008 at 3:20 PM subject: Re: [MPlayer-dev-eng] [PATCH] vo_macosx: option to set shared buffer name to allow multiple instances git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28165 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Merge svn changes up to r28162Uoti Urpala2008-12-193-2/+3
|\| |
| * | Do not use full relative #include path for headers in the same directory.diego2008-12-171-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28157 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | #include sub.h instead of locally declaring vo_draw_text().diego2008-12-171-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28156 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | xvmc is now a CONFIG_ option in FFmpeg.diego2008-12-151-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28154 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Merge svn changes up to r28149Uoti Urpala2008-12-147-60/+355
|\| | | |/ |/|
| * Add support for writing PNG files with alpha channel in -vo pngreimar2008-12-101-2/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28126 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).reimar2008-12-101-3/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28125 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix MGSTR vs. MSGTR typo.diego2008-12-091-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28122 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set d3d_handle to NULL after release.reimar2008-12-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28121 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Forgotten part of previous cosmetics commitreimar2008-12-091-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28120 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly simplify the conditional release/free codereimar2008-12-091-21/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28119 b3059339-0415-0410-9bf9-f77b7e298cf2
| * First version of OSD support for vo_direct3dreimar2008-12-091-7/+282
| | | | | | | | | | | | | | Patch by Jim Hauxwell [james dattrax co uk] with modifications by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28118 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: indentationdiego2008-12-081-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28113 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless or even wrong N/A return values doxy commentsreimar2008-12-081-5/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28112 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing unistd.h #include, fixes the warning:diego2008-12-081-0/+1
| | | | | | | | | | | | | | libvo/vo_macosx.m:177: warning: implicit declaration of function 'ftruncate' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28111 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable, fixes the warning:diego2008-12-081-1/+0
| | | | | | | | | | | | | | libvo/vo_macosx.m:735: warning: unused variable 'lastTime' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28110 b3059339-0415-0410-9bf9-f77b7e298cf2
| * #include appropriate headers instead of locally declaring function prototypes.diego2008-12-082-5/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28109 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ati_hack only makes sense when PBOs are used, not with mesa_buffer.reimar2008-12-061-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28108 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More possible fixes for mesa-buffer mode.reimar2008-12-061-3/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28107 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move one ati_hack check to a better place.reimar2008-12-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28106 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindentreimar2008-12-061-11/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28105 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.reimar2008-12-062-5/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28104 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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
| *