summaryrefslogtreecommitdiffstats
path: root/libvo/vo_gl.c
Commit message (Collapse)AuthorAgeFilesLines
* Change type names to match upstream libassGrigori Goronzy2009-08-071-4/+4
|
* Remove internal libass treeUoti Urpala2009-07-261-2/+1
| | | | | Remove the libass/ directory and use the newest standalone version of the library instead.
* Remove the internal GUIAnton Khirnov2009-07-071-14/+0
| | | | | | | | | The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it.
* Remove trailing whitespace from most filesUoti Urpala2009-07-071-4/+4
|
* Merge branch 'ordered_chapters'Uoti Urpala2009-04-081-1/+0
|\
| * VO: Don't reset pause status in VO config() functionsUoti Urpala2009-04-021-1/+0
| | | | | | | | | | | | | | | | | | Many VOs kept track of pause status, but reset the value when their config() function was called. However it can be called while playback stays in pause mode. Modify the VOs to not change anything in config(). Also send the VO either VOCTRL_PAUSE or VOCTRL_RESUME when the playback of a new file is starting to make sure they have the right status.
* | Merge svn changes up to r29117Uoti Urpala2009-04-011-0/+3
|\ \
| * | Check mpi type before returning an DR buffer in get_image, fixes jerkinessreimar2009-03-161-0/+3
| | | | | | | | | | | | | | | | | | | | | with MPEG1/2 and -dr -slices git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28974 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | vo_gl: Fix libass subtitles disappearing during pauseUoti Urpala2009-03-221-0/+2
| |/ |/| | | | | | | | | | | EOSD bitmaps were not properly redrawn when the screen was updated to change other OSD content, resulting in libass subtitles disappearing if the OSD changed while paused. Fixed by adding a call to redraw the EOSD part too.
* | Merge svn changes up to r28951Uoti Urpala2009-03-141-1/+1
|\|
| * Make data related to suboption parsing const in libvoreimar2009-03-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-27/+52
|\|
| * Refactor smalltex/tinytex EOSD optimization in vo_glreimar2009-03-061-18/+39
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28849 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD,reimar2009-03-061-3/+2
| | | | | | | | | | | | | | just like vo_vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28843 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not rely on draw_osd to render the EOSD, instead draw it already at thereimar2009-03-061-10/+15
| | | | | | | | | | | | | | | | end of genOSD. Fixes that the EOSD was drawn one frame too late. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28838 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-181-1/+2
|\| | | | | | | | | | | | | | | Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions.
| * 100l, reset ass_border when switching out of fullscreen mode.reimar2009-02-171-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28625 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-0/+18
|\|
| * Add standard license headers, unify header formatting.diego2009-02-081-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28461Uoti Urpala2009-02-041-2/+11
|\|
| * Add [gl] in front of vo_gl messagereimar2009-02-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28459 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are ↵reimar2009-02-031-1/+10
| | | | | | | | | | | | | | | | | | much faster without it. Change autodetection accordingly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28458 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-1/+2
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Change vo_draw_text to a vo_draw_text_ext function which draws DVD navigationreimar2009-01-101-1/+2
| | | | | | | | | | | | | | highlights at the correct position with the high-resolution OSD of -vo gl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28290 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge branch 'pause'Uoti Urpala2009-01-151-0/+6
|\ \
| * | vo_gl: Support changing OSD over existing frameUoti Urpala2009-01-141-0/+6
| | |
* | | Merge svn changes up to r28204Uoti Urpala2008-12-271-1/+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
| * | 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
* | | Merge svn changes up to r28149Uoti Urpala2008-12-141-23/+41
|\| | | |/ |/|
| * 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
| * 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-061-5/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28104 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28103Uoti Urpala2008-12-061-15/+53
|\|
| * 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-051-5/+27
| | | | | | | | 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
| * 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-051-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28093 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-17/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Some whitespace and () cosmeticsreimar2008-12-031-17/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28069 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28038Uoti Urpala2008-11-251-1/+41
|\|
| * 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
| * 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
* | Merge svn changes up to r27979Uoti Urpala2008-11-221-8/+0
|\|
| * Factor common code like -wid handling, vo_gc creation etc. out intoreimar2008-11-191-8/+0
| | | | | | | | | | | | | | x11_common.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-9/+8
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Fix ati-hack to work again with ATI 8.9 and later drivers.reimar2008-11-141-9/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27908 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27682Uoti Urpala2008-10-021-8/+8
|\| | | | | | | | | | | | | | | | | Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c
| * Change glCreateClearTex to use the same host data format as later uploads.reimar2008-09-201-8/+8
| | | | | | | | | | | | | | This fixes at least some of the massive performance problems the ATI drivers have. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27653 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Rename font-related preprocessor directives.diego2008-08-071-1/+1
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-2/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename two GUI-related preprocessor directives:diego2008-07-301-2/+2
| | | | | | | | | | | | | | HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27347Uoti Urpala2008-07-251-3/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: libvo/x11_common.c libvo/x11_common.h Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts with the global variable "vo_border"; done in the merge commit because uses of the macro needed changes anyway to resolve conflicts.
| * Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.reimar2008-07-221-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27242Uoti Urpala2008-07-091