summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* cleanup: move MP_NOPTS_VALUE definition to mpcommon.hUoti Urpala2011-01-151-4/+1
|
* subtitles: move global ass_track to struct osd_stateUoti Urpala2011-01-151-0/+1
|
* core: move global "subdata" and "vo_sub_last" to mpctxUoti Urpala2011-01-111-1/+0
|
* vo_vdpau: allow "deint=-N" to specify mode without enabling deintUoti Urpala2011-01-041-3/+7
| | | | | | | | | Allow negative values of the "deint" parameter and make them select the same deinterlacing mode as the corresponding positive value, but without enabling deinterlace on startup. This is useful for configuration files. Also tweak the overall manpage description of vo_vdpau a bit to make it sound less as if the VO would be for hardware acceleration only.
* Merge branch 'hr-seek'Uoti Urpala2010-12-205-25/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hr-seek: input: add default keybindings Shift+[arrow] for small exact seeks input: support bindings with modifier keys for X input core: audio: make ogg missing audio timing workaround more complex core: add support for precise non-keyframe-limited seeks core: add struct for queued seek info commands: add generic option -> property wrapper options: add "choice" option type, use for -pts-association-mode core: remove looping in update_video(), modify command handling a bit core: seek: use accurate seek mode with audio-only files core: avoid using sh_video->pts as "current pts" libvo: register X11 connection fd in input event system core: timing: add special handling of long frame intervals core: move central play loop to a separate function Conflicts: DOCS/tech/slave.txt
| * input: support bindings with modifier keys for X inputUoti Urpala2010-12-202-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for binding commands to modifier+key combinations like "Shift+Left" or "Ctrl+Alt+x", and support reading such combinations from the output window of X VOs. The recognized modifier names are Shift, Ctrl, Alt and Meta. Any combination of those and then a non-modifier key name, separated by '+', is accepted as a key name in input.conf. For non-special keys that produce characters shift is ignored as a modifier. For example "A" is handled as a key without modifiers even if you use shift to write the capital letter; 'a' vs 'A' already distinguishes the combinations with a normal keymap, and having separate 'a', 'Shift+A' and 'A' (written with caps lock for example) would bring more confusion than benefit. Currently reading the modifier+key combinations is only supported in the output window of those VOs that use x11_common.c event handling. It's not possible to input the key combinations in other VOs or in a terminal window.
| * libvo: register X11 connection fd in input event systemUoti Urpala2010-12-144-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Register the X11 connection fd in the input system so that mp_input_get_cmd() can immediately wake up and handle keyboard or other X events. The callback calls vo_check_events() and tells the input system to handle any input possibly recorded during that. Before this was done for vo_xv only; this commit generalizes it to all VOs that call vo_x11_create_vo_window() - those are hopefully ones that will handle all X events in check_events(). The callback is only kept registered while the vo is properly configured. At other times calling check_events() would not clear pending input and so could lead to a busy loop.
* | cosmetics: remove unused code, small formatting tweaksUoti Urpala2010-12-201-6/+6
| |
* | font_load_ft.c: disable -fontconfig if compiled without libfontconfigkomh2010-12-161-0/+4
|/ | | | | | | | Set the option value to disabled, not enabled, if the functionality is not available at all. Without this, -font and -subfont do not work when using -ass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32636 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_vdpau: remove wrong mp_image usage_count change (no visible effect)Uoti Urpala2010-12-131-1/+1
| | | | | | | The wrong variable was used as a function argument, and as a result the code modified the usage_count field of non-refcounted mp_image types. This error did not have any effect on visible behavior as no code cares about the field value in the affected case.
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-1422-94/+52
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: create stereo-capable window when using Quadbuffer 3Dreimar2010-11-143-0/+5
| | | | | | | Select a stereo pixel format for window when Quadbuffer OpenGL was selected as 3D mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32620 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo/w32_common.c: Move setting of pixel format from init to configreimar2010-11-141-21/+21
| | | | | | This allows it to depend on flags etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32619 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo/w32_common.c: minor cleanupreimar2010-11-141-18/+19
| | | | | | | | | | Some indentation fixes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32611 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify: Use early return instead of large if block. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32612 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: don't check for NULL before free()diego2010-11-082-21/+17
| | | | | | patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_kva: Restore all the attributes after changing aspect ratiokomh2010-11-071-0/+9
| | | | | | kvaSetup() resets all the attributes, so there is need to restore them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32570 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_kva: Prevent a parent window from painting over ours in slave modekomh2010-11-071-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32569 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_directx: Fix possible out-of-bounds accessreimar2010-11-071-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32568 b3059339-0415-0410-9bf9-f77b7e298cf2
* options: move -name and -title to option structClément Bœsch2010-11-043-10/+5
|
* vo_gl: Move the read_pnm function into a separate filecigaes2010-11-021-60/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32513 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Extract code to read a pnm file into a separate functionreimar2010-11-021-24/+48
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32479 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_dxr3: Fix validity checks before closing a file descriptorreimar2010-11-021-3/+3
| | | | | | -1 is invalid (and the initial value), 0 is not. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32467 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_dxr3: Fix indentationreimar2010-11-021-20/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32466 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_mga: minor code cleanupreimar2010-11-021-13/+16
| | | | | | | | | | | | | | Spelling fix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32459 b3059339-0415-0410-9bf9-f77b7e298cf2 Use FFALIGN macro. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32460 b3059339-0415-0410-9bf9-f77b7e298cf2 Spelling fix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32461 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xmga: Remove an unmotivated and pointless panscan_calc callreimar2010-11-021-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32458 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xvidix: reconfigure also on window movereimar2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32457 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xmga: fix event handlingreimar2010-11-021-4/+4
| | | | | | | Fix xmga event handling: Reconfigure hardware on move and resize, redraw colorkey on resize and expose. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32456 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xmga: Remove a useless MGA_VID_CONFIG ioctlreimar2010-11-021-3/+0
| | | | | | set_window already does this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32455 b3059339-0415-0410-9bf9-f77b7e298cf2
* x11_common: add VO_EVENT_MOVEreimar2010-11-022-2/+7
| | | | | | | | | Add VO_EVENT_MOVE which is required for VOs that interact directly with hardware like MGA and VIDIX. Patch by Dirk Porezag [porezag yahoo com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32454 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_mga: switch to newer screen dimension handling APIreimar2010-11-022-79/+23
| | | | | | | Switch (x)mga vo to new libvo API to reduce code duplication and improve consistency between vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32453 b3059339-0415-0410-9bf9-f77b7e298cf2
* aspect.c: use fallback if screen dimensions are not knownreimar2010-11-021-0/+6
| | | | | | | | | | | | Add fallback values to aspect_save_screenres to avoid division by 0 if screen dimensions are not known. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32452 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix handling of invalid values in aspect_save_screenres to not overwrite valid values. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32481 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove remaining %lf printf conversionsreimar2010-11-021-7/+7
| | | | | | Most cases are just code in comments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32438 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo: remove UNUSED() macrosdiego2010-11-028-63/+1
| | | | | | | | Remove UNUSED macros used to shut up unused function parameter warnings. The macros are duplicated all over libvo and serve no useful purpose nowadays. A better way to shut up the warnings is -Wno-unused-parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32422 b3059339-0415-0410-9bf9-f77b7e298cf2
* vesa_lvo.c: make functions staticdiego2010-11-022-11/+6
| | | | | | | | | | | Mark functs not used outside of the file as static, remove from header; fixes: libvo/vesa_lvo.c:187: warning: no previous prototype for 'vlvo_draw_slice' libvo/vesa_lvo.c:205: warning: no previous prototype for 'vlvo_draw_frame' libvo/vesa_lvo.c:214: warning: no previous prototype for 'vlvo_flip_page' libvo/vesa_lvo.c:275: warning: no previous prototype for 'vlvo_draw_osd' libvo/vesa_lvo.c:312: warning: no previous prototype for 'vlvo_query_info' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32288 b3059339-0415-0410-9bf9-f77b7e298cf2
* vesa_lvo.c: Move vlvo_preinit() below the functions that it usesdiego2010-11-021-23/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32287 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_vesa: Mark vlvo_draw_slice_420() as staticdiego2010-11-021-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32286 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_vesa: mark a function staticdiego2010-11-021-1/+1
| | | | | | | Mark fillMultiBuffer() as static, it is not used outside of the file; fixes: libvo/vo_vesa.c:532: warning: no previous prototype for 'fillMultiBuffer' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32284 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_vesa, vo_directfb2: Replace local min/max macros by FFMIN/FFMAXdiego2010-11-022-18/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32282 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_mga: use libswscale interface for g200 (untested)ramiro2010-11-021-16/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32280 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_caca: Update URL to patch for new API supportdiego2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32260 b3059339-0415-0410-9bf9-f77b7e298cf2
* build: update DirectFB requirements, reduce #ifdefsdiego2010-11-023-115/+7
| | | | | | | | | | | | | | | | | | Require DirectFB version 0.9.15 instead of 0.9.13. This simplifies the build system at the cost of requiring a library version that was released at the end rather than the middle of 2002. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32251 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify DirectFB check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32252 b3059339-0415-0410-9bf9-f77b7e298cf2 Require DirectFB version 0.9.22. This allows getting rid of a lot of library version check #ifdeffery. Release 0.9.22 is from February 2005, so the requirement is reasonable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32253 b3059339-0415-0410-9bf9-f77b7e298cf2
* build: enable/disable all FFmpeg libraries togetherUoti Urpala2010-11-021-1/+1
| | | | | | | | | Enable all of libavcodec, libavformat, libswscale, and libpostproc together (libavutil is always required). based on svn commit by diego: git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo.h: Add standard multiple inclusion guardsdiego2010-11-021-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32210 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_ivtv; Move ivtv_fd extern variable declaration to vo_ivtv.hdiego2010-11-021-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32159 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_v4l2: Move v4l2_fd extern declaration to vo_v4l2.hdiego2010-11-021-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32158 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_mpegpes,vo_mpegpes: Rename vo_mpegpes_fd2 variable to ao_mpegpes_fddiego2010-11-021-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32154 b3059339-0415-0410-9bf9-f77b7e298cf2
* mga: disable g200 supportramiro2010-11-021-2/+8
| | | | | | | g200 should use the swscale interface to convert to nv12. If anyone still uses such a card and is willing to test, just let me know. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32111 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add central init_avcodec() to avoid duplicated libavcodec init codediego2010-11-021-11/+2
| | | | | | | | | | | | | | | | Patch by Vlad Seryakov, vseryakov gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32043 b3059339-0415-0410-9bf9-f77b7e298cf2 Refactor more instances of avcodec_initialized handling into init_avcodec(). This is a leftover from the previous commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32044 b3059339-0415-0410-9bf9-f77b7e298cf2 Add missing #include for vd_ffmpeg.h; fixes the warning: libmpcodecs/vf_zrmjpeg.c:472: warning: implicit declaration of function 'init_avcodec' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32176 b3059339-0415-0410-9bf9-f77b7e298cf2
* spelling fixessiretart2010-11-024-6/+6
| | | | | | | | | | Found by the Debian QA tool 'lintian' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2 reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl.c: Use early return instead of large if blockreimar2010-11-021-26/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31887 b3059339-0415-0410-9bf9-f77b7e298cf2 Reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31888 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Make OSD rendering code more readablereimar2010-11-021-7/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31886 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Move variable into the only function it's used inreimar2010-11-022-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31826 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: move mouse hiding to check_eventsreimar2010-11-021-23/+21
| | | | | | | | Move mouse hiding code to check_events, this allows mouse hiding to continue to work with -idle -fixed-vo, after the video has finished but the last frame is still displayed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31825 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Make the Quit menu entry workreimar2010-11-021-0/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31824 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: simplify check_eventsreimar2010-11-021-1/+1
| | | | | | Simplify check_events: avoid seemingly pointless untilDate argument. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31823 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: change window-closing handlingreimar2010-11-021-2/+5
| | | | | | | | Change window-closing handling so it works properly if the KEY_CLOSE_WIN is rebound to e.g. skip to next file or not bound at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31822 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo, vo_quartz: remove useless kQuitCmdreimar2010-11-023-7/+0
| | | | | | | | | | | | Remove kQuitCmd, it has no purpose or effect at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31811 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove unused kQuitCmd from vo_quartz. While just as useless as for corevideo, the "Quit" menu item at least works through kHICommandQuit here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31812 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: indentation fixesreimar2010-11-022-27/+27
| | | | | | | | | | Cosmetics: indentation fixes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31808 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix indentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31810 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Avoid some code duplication.reimar2010-11-021-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31809 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Simplify update_screen_inforeimar2010-11-021-7/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31806 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid some code duplication in update_screen_info. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31807 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: avoid dangerous castsreimar2010-11-021-3/+2
| | | | | | Declare variables with proper types to avoid dangerous pointer casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31805 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo.m: remote useless parentheses and castsreimar2010-11-021-11/+11
| | | | | | | | | | | | | | Remove useless (). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31802 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove yet more useless () git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31803 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove pointless casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31804 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_corevideo: Send KEY_CLOSE_WIN instead of KEY_ESC for quitreimar2010-11-021-2/+2
| | | | | | | Send KEY_CLOSE_WIN instead of KEY_ESC when the user requested corevideo to quit, KEY_ESC might have been rebound to something else. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31801 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl2: Use identical code to -vo gl for -wid modereimar2010-11-021-3/+4
| | | | |