summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27374Uoti Urpala2008-07-305-15/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-305-15/+14
| | | | | | | | | | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27347Uoti Urpala2008-07-255-7/+13
|\| | | | | | | | | | | | | | | | | | | | | 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-225-6/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support -noborder with X11-based vosreimar2008-07-221-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27336 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make vo_x11_fullscreen not break vo_border (proper support still needs vo ↵reimar2008-07-221-1/+1
| | | | | | | | | | | | changes) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27335 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27242Uoti Urpala2008-07-091-3/+6
|\| | | | | | | | | | | | | Conflicts: Makefile configure
| * One more hack for PBOs on ATI cards.reimar2008-07-061-0/+3
| | | | | | | | | | | | | | Either I am doing something very wrong or they managed to code at about 1 bug per line... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27216 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move at-hack code a bit up for further changesreimar2008-07-061-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27215 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27202Uoti Urpala2008-07-051-2/+5
|\|
| * 100l: finally understood ATI PBO problem: width must be a power of two.reimar2008-07-041-2/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27201 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More stride alignment is needed to work reliably on ATI cards :-(reimar2008-07-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27200 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move global sub_font to OSD structUoti Urpala2008-06-243-11/+11
| |
* | Create a context struct for OSD stateUoti Urpala2008-06-248-41/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit creates the struct and passes it to some functions that needs to access OSD state but does not yet move much data from globals to it. vf_expand accesses the OSD state for rendering purposes outside of the normal OSD draw time. The way this currently works is suboptimal, but I did not attempt to clean it up now. To keep things working the same way vf_expand needs to know the address of the state object to be able to access the data even in the functions that should normally not need it. For that purpose this commit adds a VFCTRL to tell vf_expand the address of the object.
* | Merge svn changes up to r27123Uoti Urpala2008-06-236-7/+9
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * 100l, bpp is bits per pixel, not bytesreimar2008-06-221-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27121 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove useless typedef againstfor VDXContextben2008-06-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27116 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove now useless vidixlib.h fileben2008-06-204-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27111 b3059339-0415-0410-9bf9-f77b7e298cf2
| * allow conditionnal compilation of yuv4mpeg video out.ben2008-06-201-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27103 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27092Uoti Urpala2008-06-175-6/+8
|\| | | | | | | | | | | | | | | Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
| * Add missing string.h #include for memcpy prototype;diego2008-06-161-0/+1
| | | | | | | | | | | | | | fixes warnings with 'make checkheaders'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27076 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move message about which adapter is used to verbose mode.diego2008-06-151-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27063 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add parentheses to expression to avoid the warning:diego2008-06-151-1/+1
| | | | | | | | | | | | | | | | libvo/x11_common.c: In function 'xss_suspend': libvo/x11_common.c:1618: warning: suggest parentheses around && within || git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27061 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Give name to font_desc struct, patch by Bryan Henderson, giraffedata gmail com.diego2008-06-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27045 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly reduce VIDIX video output verbosity.diego2008-06-081-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27040 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27025Uoti Urpala2008-06-073-24/+6
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * declare some functions as staticben2008-06-072-9/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27014 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove useless vidix versioning stuffben2008-06-071-5/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27009 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove duplicated codeben2008-06-071-6/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27008 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop some useless parameter from vidix init routineben2008-06-071-4/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27007 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop support for external libvidix (unmaintained and not up-to-date)ben2008-06-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27006 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary mangle.h #include.diego2008-06-041-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26982 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-0421-274/+271
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * Fix typo in string name.diego2008-05-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26900 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Render everything as early as possible, doing as little as possible inreimar2008-05-251-4/+19
| | | | | | | | | | | | | | | | flip_page. Can improve A-V sync when playing a video that uses little CPU with GPU filtering that is very slow. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26874 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reorder flip_page to make moving around do_render call easierreimar2008-05-251-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26873 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Split flip_page functionreimar2008-05-251-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26872 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify yuv to rgb conversion matrix stuff.reimar2008-05-241-51/+52
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26871 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: alignreimar2008-05-241-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26870 b3059339-0415-0410-9bf9-f77b7e298cf2
| * update doxygen commentsreimar2008-05-241-29/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26869 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a filter strength parameter for blurring/sharpening scalers.reimar2008-05-243-9/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26868 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Forgotten changes to gl_common.hreimar2008-05-241-5/+15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26867 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use a struct instead of a huge and further growing argument list.reimar2008-05-243-51/+45
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26866 b3059339-0415-0410-9bf9-f77b7e298cf2
| * make use of the new MGA_VID_VERSION ioctl to checkattila2008-05-231-0/+11
| | | | | | | | | | | | | | | | whether the installed driver has the version we expect it to have. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26863 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Saner handling of VOCTRL_PAUSE/VOCTRL_RESUMEreimar2008-05-222-4/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26855 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify equalizer handling for vo glreimar2008-05-221-54/+32
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26854 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove useless parentheses from from return statements.diego2008-05-1622-82/+82
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vo_xv: Fix port selectionUoti Urpala2008-05-151-2/+1
| | | | | | | | | | | | Port selection was broken in conversion to new VO API (the user setting was parsed to a variable that then wasn't used for anything). Fix by parsing it to the x11 struct xv_port variable.
* | Merge svn changes up to r26783Uoti Urpala2008-05-1518-187/+240
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Use standard license headers with standard formatting.diego2008-05-1415-185/+197
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26771 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a new suboption to -vo xv and -vo xvmc that allows selectionben2008-05-132-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | of XVideo adaptor to be used (instead of default one, which is #0). This is useful for example if you'd rather like to use the original Overlay renderer of your GPU instead of the texture blitting engine (which is usually default), which is number one cause of nasty video tearing effects. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26762 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add force-pbo suboption for faster OpenGL output.reimar2008-05-101-2/+22
| | | | | | | | | | | | | | | | Based on a patch by Sven Gothel sgothel-jausoftcom. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26713 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfersreimar2008-05-101-0/+7
| | | | | | | | | | | | | | to avoid what is probably a bug in the driver. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26709 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26680Uoti Urpala2008-05-071-5/+3
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * vo_gl -dr actually works fine with non-readable MP_IMGTYPE_IP and ↵reimar2008-05-031-2/+0
| | | | | | | | | | | | MP_IMGTYPE_IPB. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26656 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix 100l: mpi->height must be used to calculate required memory, not mpi->h.reimar2008-05-031-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26654 b3059339-0415-0410-9bf9-f77b7e298cf2
* | sub.h: Remove obsolete code under #if 0Uoti Urpala2008-05-011-10/+0
| | | | | | | | | | According to the comment this was once a way to disable subtitles, but changing the #if 0 to #if 1 couldn't have compiled for years.
* | Move aspect.c options to option structUoti Urpala2008-05-011-12/+10
| |
* | libvo: Move aspect.c static variables to vo structUoti Urpala2008-05-0111-110/+128
| | | |