summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xvmc.c
Commit message (Collapse)AuthorAgeFilesLines
* vo_xvmc: drop XvMC supportUoti Urpala2011-05-091-1315/+0
| | | | | | | | | Due to libavcodec changes vo_xvmc would have needed some modifications to keep working. However, I think there's little real demand for XvMC, so I'll just drop XvMC support. XvMC only supported MPEG-2, making it of very limited usefulness nowadays, plus the vo_xvmc implementation was not high quality and never worked particularly well or reliably anyway.
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-261-1/+1
|
* libvo: remove UNUSED() macrosdiego2010-11-021-3/+0
| | | | | | | | 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
* spelling fixessiretart2010-11-021-3/+3
| | | | | | | | | | 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
* Merge svn changes up to r31004Uoti Urpala2010-04-261-1/+1
|\
| * Use (void) instead of () to indicate a parameterless function, fixes:diego2010-03-281-1/+1
| | | | | | | | | | | | | | libvo/vo_xvmc.c:123: warning: function declaration isn't a prototype git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30975 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30663Uoti Urpala2010-03-101-2/+0
|\| | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
| * Remove pointless '#if 1' preprocessor directives.diego2010-02-191-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Uoti Urpala2010-01-081-2/+2
|\|
| * Fix function declarations to avoid casting function pointers.reimar2010-01-011-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove the internal GUIAnton Khirnov2009-07-071-8/+0
| | | | | | | | | | | | | | | | | | The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it.
* | Merge svn changes up to r29117Uoti Urpala2009-04-011-2/+2
|\|
| * Fix warning: Add forgotten 'int' to variable declaration.iive2009-03-151-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28965 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: typo fixdiego2009-03-151-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28954 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28951Uoti Urpala2009-03-141-3/+1
|\|
| * Setting vo_fs is handled by x11_common.c, so remove that code from ↵reimar2009-03-071-2/+0
| | | | | | | | | | | | vo_xv/vo_xvmc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28864 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make data related to suboption parsing const in libvoreimar2009-03-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28690Uoti Urpala2009-02-211-970/+954
|\|
| * 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
* | Merge svn changes up to r28641Uoti Urpala2009-02-181-2/+2
|\| | | | | | | | | | | | | | | 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-171-1/+1
| | | | | | | | | | | | | | 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
| * 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-131-16/+5
|\|
| * Add a calc_src_dst_rects that calculates from window size, panscan etc.reimar2009-02-121-16/+5
| | | | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-0/+18
|\|
| * Add standard license headers, unify header formatting.diego2009-02-081-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-42/+27
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Fix build: calc_drwXY was factorized into vo_calc_drwXY.diego2009-01-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28286 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor calc_drwXY out of vo_xv and vo_xvmc.cehoyos2009-01-091-17/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28285 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing 'void' keyword to parameterless function declarations.diego2009-01-051-7/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sync with latest round of xvmc changes in FFmpeg.diego2009-01-021-19/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28237 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28038Uoti Urpala2008-11-251-8/+1
|\|
| * Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declarationreimar2008-11-231-5/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27986 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variables and the related warnings along with them.diego2008-11-231-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27980 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27979Uoti Urpala2008-11-221-23/+0
|\|
| * Remove a aspect calculation line.reimar2008-11-211-1/+0
| | | | | | | | | | | | | | | | | | | | It is useless because with the new API enabled by VOCTRL_UPDATE_SCREENINFO it is not necessary because it is already done in video_out.c:config_video_out. Secondly, the removal of the aspect_save_prescale triggered a regression because of it, with -wid the window would not be filled completely initially. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27978 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor common code like -wid handling, vo_gc creation etc. out intoreimar2008-11-191-22/+0
| | | | | | | | | | | | | | x11_common.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-28/+2
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Remove a useless XGetGeometry call, the X11 event handling alreadyreimar2008-11-171-5/+0
| | | | | | | | | | | | | | updates vo_dwidth/vo_dheight. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27946 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of (besides useless assignments) unused XSizeHints variablereimar2008-11-161-7/+0
| | | | | | | | | | | | in vo_xvmc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27942 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove explicit setting of vo_ontop since that is already done by ↵reimar2008-11-151-2/+0
| | | | | | | | | | | | vo_x11_create_vo_window git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove now unused variables.reimar2008-11-151-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27926 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) samereimar2008-11-151-11/+2
| | | | | | | | | | | | | | boiler-plate code with them, just with different bugs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27458Uoti Urpala2008-08-121-2/+0
|\|
| * Remove duplicated prototype for XShmGetEventBase(), becausediego2008-08-091-2/+0
| | | | | | | | | | | | | | | | | | - it is used in other places without checking, - it is a workaround for a bug elsewhere, - if the problem is real at all, there should be a proper configure check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27444 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-6/+6
|\