summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30798Uoti Urpala2010-03-104-8/+80
|\
| * Remove unused static function send_lpcm_packet().cehoyos2010-02-271-7/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30766 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Update -vo gl info structs, it isn't X11-only since ages and there's basicallyreimar2010-02-271-4/+4
| | | | | | | | | | | | | | no code left from Arpi and it's unlikely the email address is still working anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30763 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, remove forgotten debugging code.reimar2010-02-271-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30762 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only prefer -vo gl over -vo x11 if hardware acceleration is available.reimar2010-02-272-4/+40
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30761 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable StructureNotifyMask before waiting for a DestroyNotify event.reimar2010-02-271-0/+1
| | | | | | | | | | | | | | | | Fixes hangs if OpenGL initialization fails in vo gl preinit and we call uninit while the window is still hidden. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30760 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Port yuv=... auto-detection from gl to gl2.reimar2010-02-261-2/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30753 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark character arrays as const.diego2010-02-261-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30751 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30748Uoti Urpala2010-03-103-12/+14
|\|
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-263-8/+8
| | | | | | | | | | | | | | | | These functions return void*, which is compatible with any pointer, so there is no need for casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reorder vos: prioritize -vo gl above -vo x11 and -vo matrixview down with ↵reimar2010-02-251-4/+6
| | | | | | | | | | | | aa, caca etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30741 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30732Uoti Urpala2010-03-101-3/+1
|\|
| * Unconditionally declare fast_memcpy() and mem2agpcpy().diego2010-02-251-3/+1
| | | | | | | | | | | | | | | | | | This fixes the following warnings on non-x86 systems: libvo/aclib.c:162: warning: no previous prototype for 'fast_memcpy' libvo/aclib.c:196: warning: no previous prototype for 'mem2agpcpy' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30728 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare externally used variables from vd.c as extern in vd.h.diego2010-02-221-2/+1
| | | | | | | | | | | | | | This saves declaring them as extern all over the place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30694Uoti Urpala2010-03-102-0/+29
|\|
| * Add header for v4l2_write() instead of forward declaring it.diego2010-02-212-0/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30692 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30675Uoti Urpala2010-03-101-1/+0
|\|
| * cosmetics: Remove pointless empty lines at EOF.diego2010-02-2012-13/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30663Uoti Urpala2010-03-103-6/+0
|\| | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
| * Remove pointless '#if 1' preprocessor directives.diego2010-02-193-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30643Uoti Urpala2010-03-102-1/+30
|\|
| * Add header for functions exported from vo_zr.c and use it appropriately.diego2010-02-182-1/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30635 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30605Uoti Urpala2010-03-093-10/+9
|\|
| * Move struct typedef pixbuf into the only .c file where it is used.reimar2010-02-162-7/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30603 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless malloc casts.reimar2010-02-161-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30602 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused XPM-loading function pixbuf_load_xpm() from spuenc.c.reimar2010-02-162-48/+0
| | | | | | | | | | | | | | Remove unused function pixbuf_delete() from spuenc.[ch]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30601 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libvo: Mark functions not used outside of their files as static.diego2010-02-168-24/+43
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30598 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30595Uoti Urpala2010-03-091-22/+4
|\| | | | | | | | | | | Conflicts: mplayer.c vidix/nvidia_vid.c
| * Remove unused variable.reimar2010-02-141-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30589 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use memset to initialize huge arrays.reimar2010-02-141-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30588 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless explicit member initialization to 0 when the structreimar2010-02-141-17/+0
| | | | | | | | | | | | | | is already zeroed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30587 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use calloc instead of malloc+memsetreimar2010-02-141-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30586 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add xscreensaver_heartbeat() declaration to x11_common.h.diego2010-02-141-0/+1
| | | | | | | | | | | | | | This avoids a forward declaration in mplayer.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30574 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix exit_player() usage throughout the codebase.diego2010-02-145-24/+22
| | | | | | | | | | | | | | | | | | | | exit_player() was declared with differing parameter types in mplayer.c and mplayer.h. Make the declaration in the .h file match the one in the .c file and adjust all usages of exit_player() throughout the codebase. Also move the exit_player() declaration into mp_core.h next to exit_player_with_rc(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30558 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30514Uoti Urpala2010-03-095-32/+42
|\|
| * Fix hang with -fixed-vo due to VOFLAG_HIDDEN never being removed from ↵reimar2010-02-051-0/+1
| | | | | | | | | | | | window_state. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30514 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print messages only after we are sure preinit will not fail anymore.reimar2010-02-051-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30510 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for VOFLAG_HIDDEN to the w32 backend.reimar2010-02-041-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30509 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set the PixelFormat right after creating the window and set it only once.reimar2010-02-041-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30508 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Create the OpenGL probe window as a hidden Window on X11.reimar2010-02-043-3/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30507 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l: Fix compilation (broken by me).cehoyos2010-02-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30504 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Clarify -vo vdpau:pullupcehoyos2010-02-041-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30503 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30502Uoti Urpala2010-03-091-1/+1
|\| | | | | | | | | | | | | | | Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb.h libswscale/swscale.c libvo/x11_common.c
| * Use vo_x11_clearwindow instead of XClearWindow, both for consistency and alsoreimar2010-02-031-1/+1
| | | | | | | | | | | | | | | | because vo_x11_clearwindow works as intended also when the background is set to None. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30497 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30494Uoti Urpala2010-03-093-33/+47
|\| | | | | | | | | | | Conflicts: libvo/vo_gl.c libvo/x11_common.c
| * Remove a duplicated vo_x11_sizehint, vo_x11_nofs_sizepos already calls thisreimar2010-02-021-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30493 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless initializers and also set geometry_*_changed to 0 whenreimar2010-02-021-7/+5
| | | | | | | | | | | | | | | | -geometry did not adjust some values (instead of only ever setting them to 1 and never reset them). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30492 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for autodetection during preinit and use that to detect a defaultreimar2010-02-021-22/+42
| | | | | | | | | | | | | | value for the yuv suboption. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30489 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid using options before autodetectGlExtensions to allow it to change them ↵reimar2010-02-021-5/+3
| | | | | | | | | | | | properly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30488 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove vo_config_count check from uninit, it should always be safe to run.reimar2010-02-021-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30487 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing #include, fixes the warning:diego2010-01-301-0/+1
| | | | | | | | | | | | | | libvo/vo_png.c:147: warning: implicit declaration of function 'imgfmt2pixfmt' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30469 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30463Uoti Urpala2010-03-092-1/+24
|\| | | | | | | | | | | Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
| * Add missing license header and multiple inclusion guards.diego2010-01-301-0/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30456 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try the more specific names first for the SwapInterval function to make it lessreimar2010-01-281-1/+1
| | | | | | | | | | | | | | likely we get an incompatible one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30451 b3059339-0415-0410-9bf9-f77b7e298cf2
| * glXSwapIntervalEXT is defined to take different arguments from ↵reimar2010-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | glXSwapIntervalSGI, so do not try to use it. Patch by Stephen Warren [swarren nvidia com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30450 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-072-2/+2
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
* | build/vdpau: drop support for dynamic loading of libvdpauUoti Urpala2010-02-261-26/+2
| | | | | | | | | | | | | | | | | | | | After a recent library update on my system MPlayer started crashing on exit in XCloseDisplay() if -vo vdpau had been used. With normal linking it works OK. Since there should be little need for the dynamic loading functionality any more, I'll just drop it rather than try investigating the exact problem with dynamic loading and whether it would be fixable. VDPAU is now linked normally with -lvdpau if available.
* | vo_vdpau: improve VOCTRL_GET_EOSD_RES codeUoti Urpala2010-02-261-10/+4
| | | | | | | | | | | | | | | | Remove the special case for fullscreen; the same variables should have the correct values in windowed and fullscreen modes. This fixes libass subtitle positioning in the (non-typical) case where you have black bands inside a window. Behavior in fullscreen and in the typical windowed case without borders should not be affected.
* | vo_vdpau: make queuing future frame flips adjustableUoti Urpala2010-02-052-0/+10
| | | | | | | | | | | | | | | | | | | | Add -vo vdpau suboptions "queuetime_windowed" and "queuetime_fs" to specify the maximum number of milliseconds how far into the future a frame flip can be queued using the VDPAU presentation queue functionality. The intended main use of these options is to allow disabling use of the queuing feature on systems where using it causes choppiness in other graphics behavior (this is an NVIDIA driver issue; the video itself isn't affected).
* | VO: remove directfb from autoselected VOsUoti Urpala2010-01-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | VO_directfb can call exit() if initialization fails. This makes MPlayer exit without cleanup if autoselection tries it. This can be seen for example by running something like this in an X terminal: DISPLAY=foo mplayer file.mkv The easiest fix for this is to remove directdb from the list of autoselected VOs. The console VOs have enough problems that people who want to use them should know what they're doing anyway.
* | x11_common: always free x11 context struct on exitUoti Urpala