summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28712Uoti Urpala2009-02-231-5/+192
|\
| * Only check for vdp_video_mixer_destroy failure when we actually executed ↵reimar2009-02-231-2/+3
| | | | | | | | | | | | that function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28711 b3059339-0415-0410-9bf9-f77b7e298cf2
| * EOSD/ASS support for vo_vdpau.creimar2009-02-231-1/+187
| | | | | | | | | | | | | | Patch by Grigori G (greg <at> chown ath cx) with minor cosmetic changes by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28710 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add forgotten type to variable declaration.reimar2009-02-211-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28693 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28690Uoti Urpala2009-02-214-1474/+1509
|\|
| * 100l, place vdpau below xv, it should not normally be preferred for ↵reimar2009-02-211-3/+3
| | | | | | | | | | | | auto-selection (yet). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28688 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics. Reindent to 4 spaces.iive2009-02-211-473/+473
| | | | | | | | | | | | | | | | Checked for equality with diff -w. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28684 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cleanup.iive2009-02-211-20/+2
| | | | | | | | | | | | | | | | Turn a number of if(mp_msg_test()) mp_msg(); into single mp_msg() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28683 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics. Remove all trailing whitespacesiive2009-02-211-61/+61
| | | | | | | | | | | | | | and convert the few tabs into spaces. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28681 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Turn all remaining printf() into mp_msg().iive2009-02-201-84/+85
| | | | | | | | | | | | | | Try to set appropriate levels for them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28680 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cleanup.iive2009-02-201-53/+29
| | | | | | | | | | | | | | Turn a number of if(mp_msg_test()) printf(); into normal mp_msg() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28679 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics part2. Indent local variable definitions like the rest of the code.iive2009-02-201-55/+62
| | | | | | | | | | | | | | Checked for equality by diff -wB . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28678 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics part 1. Reindent to 4 spaces.iive2009-02-201-916/+916
| | | | | | | | | | | | | | Checked for equality with diff -b. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28677 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Comment out "else" statement without following block.iive2009-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28676 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move libavcodec includes together.iive2009-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28675 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Document that and why deinterlacing is not workingreimar2009-02-201-3/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28674 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for VDPAU deinterlacing, pullup, denoise and sharpening.reimar2009-02-201-5/+71
| | | | | | | | | | | | | | | | Deinterlacing can not yet be toggled at runtime, and actually it does not seem to work at all... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28673 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28655Uoti Urpala2009-02-192-2/+4
|\|
| * Use the same code to convert fps in float to fraction as used in mencoder,reimar2009-02-181-1/+1
| | | | | | | | | | | | | | | | it ensures all the common frame rates work right. If this causes issues, it should be changed in the same way in mencoder.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28650 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add VOCAP_NOSLICES and use it to allow vo_vdpau to not support slices forreimar2009-02-181-1/+3
| | | | | | | | | | | | | | | | YV12 - since VDPAU only has functions to upload the full frame at once there is no sense in supporting draw_slice for that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28646 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-1812-13/+842
|\| | | | | | | | | | | | | | | 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.
| * Extend calc_src_dst_rects to also calculate the border values needed forreimar2009-02-176-8/+30
| | | | | | | | | | | | | | correctly placed dvdnav highlights, and fix direct3d and vdpau accordingly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28633 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:diego2009-02-173-3/+3
| | | | | | | | | | | | | | mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after last commit.cehoyos2009-02-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28627 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cropping parameter to calc_src_dst_rects is constreimar2009-02-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28626 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 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
| * The CONFIG_TV_TELETEXT preprocessor directive is defined/undefined,diego2009-02-171-1/+1
| | | | | | | | | | | | | | | | so use it with #ifdef instead of #if; fixes the warning: libvo/sub.c:1233:5: warning: "CONFIG_TV_TELETEXT" is not defined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28621 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation without VDPAUuau2009-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The commit adding vo_vdpau had two bugs that broke compilation when VDPAU was not enabled. - video_out.c used "#ifdef CONFIG_VDPAU", but it's always set to 0 or 1 - In configure, MPEG1_VDPAU_DECODER was dropped from the list of libavcodec codecs to disable when moving VDPAU-related ones from the always-disabled list to a conditinal one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28620 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for VDPAU video out, including hardware decoding.reimar2009-02-162-0/+813
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace double semicolon by single semicolon.diego2009-02-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28610Uoti Urpala2009-02-161-119/+111
|\|
| * Sync renaming of xvmc struct members in FFmpeg.diego2009-02-161-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28610 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.diego2009-02-151-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28608 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reflect ffmpeg change of xvmc struct field to xvmc_id.iive2009-02-151-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28607 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all tabs and trailing whitespace.diego2009-02-151-75/+75
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28604 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg.diego2009-02-151-19/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28603 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary #ifdef around internal #include.diego2009-02-151-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28602 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The xmvc structure member magic_id was renamed to unique_id.diego2009-02-151-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28601 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reflect the change of xvmc struct name.iive2009-02-151-19/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28583 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need toreimar2009-02-151-1/+0
| | | | | | | | | | | | | | be duplicated for other systems like VDPAU or VAAPI. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28581 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Now xvmc struct uses magic_id fieldiive2009-02-151-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28578 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove display_flag remains as the member has been removed from the xvmc struct.iive2009-02-151-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28577 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove some xvmc field initializations. They are not used byiive2009-02-141-2/+0
| | | | | | | | | | | | | | | | the libavcodec decoder. They are a copy of the queried surface and are meaningful only for pixel format selection, not during decoding. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28570 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg.diego2009-02-141-15/+15
| | | | | | | | | | | | | | Also adapt MPlayer to definition name changes in libavcodec/xvmc.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28557 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28549Uoti Urpala2009-02-138-116/+113
|\|
| * Remove now unused vo_calc_drwXY function.reimar2009-02-122-18/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28547 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a calc_src_dst_rects that calculates from window size, panscan etc.reimar2009-02-125-93/+99
| | | | | | | | | | | | | | | | | | which part of the video source must be scaled onto which part of the window. Direct3D and (future) VDPAU need this, for XvMC it makes it easier to add cropping support and Xv is changed to keep the diff to XvMC small. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28546 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only set VO_EVENT_RESIZE if size actually changed, not if e.g. the window wasreimar2009-02-121-2/+6
| | | | | | | | | | | | | | only moved to the foreground. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28541 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Uoti Urpala2009-02-1252-195/+1020
|\|
| * Conditionally compile aclib.c instead of placing #ifdef around its content.diego2009-02-081-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add standard license headers, unify header formatting.diego2009-02-0851-147/+976
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid message spam during video adapter uncooperative state.gogothebee2009-02-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28469 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Unify info/error messages to a common style:gogothebee2009-02-051-43/+43
| | | | | | | | | | | | | | <vo_direct3d> in the beginning, "." at the end. Shorter/more descriptive sentences. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28468 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28461Uoti Urpala2009-02-044-25/+40
|\|
| * 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
| * Add checks that a D3D device is available before attempting rendering.reimar2009-02-031-1/+16
| | | | | | | | | | | | | | | | | | We may have lost the device e.g. because it became uncooperative e.g. when using remote desktop or Vista's UAC is activated. Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28457 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove the Present call after adapter reinitialization, it can not work anywayreimar2009-02-031-4/+0
| | | | | | | | | | | | | | since no video frame is uploaded to the new context yet. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28456 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: remove empty line, improve some messages.reimar2009-02-031-5/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28454 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Whitespace/comment typo cosmetics.reimar2009-02-031-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28453 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check for change_d3d_backbuffer failure.reimar2009-02-031-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28452 b3059339-0415-0410-9bf9-f77b7e298cf2
| *