aboutsummaryrefslogtreecommitdiffhomepage
path: root/libvo
Commit message (Collapse)AuthorAge
* Merge svn changes up to r30798Gravatar Uoti Urpala2010-03-10
|\
* \ Merge svn changes up to r30748Gravatar Uoti Urpala2010-03-10
|\ \
* \ \ Merge svn changes up to r30732Gravatar Uoti Urpala2010-03-10
|\ \ \
* \ \ \ Merge svn changes up to r30694Gravatar Uoti Urpala2010-03-10
|\ \ \ \
* \ \ \ \ Merge svn changes up to r30675Gravatar Uoti Urpala2010-03-10
|\ \ \ \ \
* \ \ \ \ \ Merge svn changes up to r30663Gravatar Uoti Urpala2010-03-10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
* \ \ \ \ \ \ Merge svn changes up to r30643Gravatar Uoti Urpala2010-03-10
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge svn changes up to r30605Gravatar Uoti Urpala2010-03-09
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge svn changes up to r30595Gravatar Uoti Urpala2010-03-09
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mplayer.c vidix/nvidia_vid.c
* \ \ \ \ \ \ \ \ \ Merge svn changes up to r30514Gravatar Uoti Urpala2010-03-09
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge svn changes up to r30502Gravatar Uoti Urpala2010-03-09
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb.h libswscale/swscale.c libvo/x11_common.c
* \ \ \ \ \ \ \ \ \ \ \ Merge svn changes up to r30494Gravatar Uoti Urpala2010-03-09
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libvo/vo_gl.c libvo/x11_common.c
* \ \ \ \ \ \ \ \ \ \ \ \ Merge svn changes up to r30463Gravatar Uoti Urpala2010-03-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | Restore collapsed whitespace in output messagesGravatar Uoti Urpala2010-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | | | | | | | | * Remove unused static function send_lpcm_packet().Gravatar cehoyos2010-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 basicallyGravatar reimar2010-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar reimar2010-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar reimar2010-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30761 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Enable StructureNotifyMask before waiting for a DestroyNotify event.Gravatar reimar2010-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar reimar2010-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30753 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Mark character arrays as const.Gravatar diego2010-02-26
| | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30751 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | | | | | | | | | | | build/vdpau: drop support for dynamic loading of libvdpauGravatar Uoti Urpala2010-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 codeGravatar Uoti Urpala2010-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | | | | | | | * Do not cast the results of malloc/calloc/realloc.Gravatar diego2010-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵Gravatar reimar2010-02-25
| | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa, caca etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30741 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | * Unconditionally declare fast_memcpy() and mem2agpcpy().Gravatar diego2010-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2010-02-22
| | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | * Add header for v4l2_write() instead of forward declaring it.Gravatar diego2010-02-21
| | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30692 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | * cosmetics: Remove pointless empty lines at EOF.Gravatar diego2010-02-20
| | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | * Remove pointless '#if 1' preprocessor directives.Gravatar diego2010-02-19
| | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | * Add header for functions exported from vo_zr.c and use it appropriately.Gravatar diego2010-02-18
| | | | | | |/ | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30635 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Move struct typedef pixbuf into the only .c file where it is used.Gravatar reimar2010-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30603 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Remove useless malloc casts.Gravatar reimar2010-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar reimar2010-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2010-02-16
| | | | | |/ | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30598 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Remove unused variable.Gravatar reimar2010-02-14
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30589 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Use memset to initialize huge arrays.Gravatar reimar2010-02-14
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30588 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Remove pointless explicit member initialization to 0 when the structGravatar reimar2010-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is already zeroed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30587 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Use calloc instead of malloc+memsetGravatar reimar2010-02-14
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30586 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Add xscreensaver_heartbeat() declaration to x11_common.h.Gravatar diego2010-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2010-02-14
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | vo_vdpau: make queuing future frame flips adjustableGravatar Uoti Urpala2010-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | | | * Fix hang with -fixed-vo due to VOFLAG_HIDDEN never being removed from ↵Gravatar reimar2010-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar reimar2010-02-05
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30510 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Add support for VOFLAG_HIDDEN to the w32 backend.Gravatar reimar2010-02-04
| | | | | | | | | | | | | | | | | | | | 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.Gravatar reimar2010-02-04
| | | | | | | | | | | | | | | | | | | | 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.Gravatar reimar2010-02-04
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30507 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * 100l: Fix compilation (broken by me).Gravatar cehoyos2010-02-04
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30504 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Clarify -vo vdpau:pullupGravatar cehoyos2010-02-04
| | | |/ | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30503 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Use vo_x11_clearwindow instead of XClearWindow, both for consistency and alsoGravatar reimar2010-02-03
| | |/ | | | | | | | | | | | | | | | | | | | | | 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