RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
29,603 Commits 41 Branches 85 Tags 133 MiB
Commit Graph

96 Commits

Author SHA1 Message Date
iive 2db1a43c2e Fix warning: Add forgotten 'int' to variable declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28965 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-15 20:02:45 +00:00
diego bf1c189439 cosmetics: typo fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28954 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-15 09:47:09 +00:00
reimar fca7818668 Setting vo_fs is handled by x11_common.c, so remove that code from vo_xv/vo_xvmc. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28864 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-07 08:52:57 +00:00
reimar 05119ecaf6 Make data related to suboption parsing const in libvo 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-07 08:51:40 +00:00
iive dbf0e084ab Turn all remaining printf() into mp_msg(). 
Try to set appropriate levels for them.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28680 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-20 23:46:24 +00:00
iive f772287521 Cleanup. 
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
 2009-02-20 23:18:28 +00:00
iive 3b4e9aa2d1 Cosmetics part2. Indent local variable definitions like the rest of the code. 
Checked for equality by diff -wB .


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28678 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-20 22:49:09 +00:00
iive d238dc2d1f Cosmetics part 1. Reindent to 4 spaces. 
Checked for equality with diff -b.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28677 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-20 22:13:31 +00:00
iive 8011ebfc9a Comment out "else" statement without following block. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28676 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-20 19:17:10 +00:00
iive 344ac5a068 Move libavcodec includes together. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28675 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-20 18:39:02 +00:00
reimar 01ef7e4579 Extend calc_src_dst_rects to also calculate the border values needed for 
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
 2009-02-17 11:59:49 +00:00
diego 1b915e419e Replace double semicolon by single semicolon. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-16 02:00:29 +00:00
diego eacf4421f4 Sync renaming of xvmc struct members in FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28610 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-16 00:29:25 +00:00
diego a452d22384 The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28608 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 22:02:24 +00:00
iive 33f7ff9403 Reflect ffmpeg change of xvmc struct field to xvmc_id. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28607 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 20:29:29 +00:00
diego e3638bae19 whitespace cosmetics: Remove all tabs and trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28604 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 17:55:57 +00:00
diego d274cbbbb5 The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28603 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 17:49:42 +00:00
diego 3a058c8c6a Remove unnecessary #ifdef around internal #include. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28602 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 17:38:47 +00:00
diego 0c4e65f15a The xmvc structure member magic_id was renamed to unique_id. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28601 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 17:35:24 +00:00
iive c97692ac9d Reflect the change of xvmc struct name. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28583 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 08:46:18 +00:00
reimar 078091e5de Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to 
be duplicated for other systems like VDPAU or VAAPI.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28581 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 08:07:36 +00:00
iive d999d7652d Now xvmc struct uses magic_id field 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28578 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 02:38:20 +00:00
iive ebe578fc77 Remove display_flag remains as the member has been removed from the xvmc struct. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28577 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 02:08:45 +00:00
iive 22e11d3bfe Remove some xvmc field initializations. They are not used by 
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
 2009-02-14 23:31:24 +00:00
diego 1538fddada Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg. 
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
 2009-02-14 17:18:55 +00:00
reimar 694c3dc03f Add a calc_src_dst_rects that calculates from window size, panscan etc. 
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
 2009-02-12 17:40:53 +00:00
diego befc528297 Add standard license headers, unify header formatting. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 03:27:30 +00:00
diego 20109f0a2e Fix build: calc_drwXY was factorized into vo_calc_drwXY. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28286 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-09 20:50:25 +00:00
cehoyos 0fa2d1abd7 Factor calc_drwXY out of vo_xv and vo_xvmc. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28285 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-09 15:25:24 +00:00
diego 824abb5a65 Add missing 'void' keyword to parameterless function declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-05 14:48:03 +00:00
diego 339746a776 Sync with latest round of xvmc changes in FFmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28237 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-02 17:06:09 +00:00
reimar 9542118efe Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declaration 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27986 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-23 12:30:39 +00:00
diego b2fb201a6b Remove unused variables and the related warnings along with them. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27980 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-23 11:53:17 +00:00
reimar 61a0561122 Remove a aspect calculation line. 
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
 2008-11-21 23:22:53 +00:00
reimar c351d29392 Factor common code like -wid handling, vo_gc creation etc. out into 
x11_common.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-19 20:19:25 +00:00
reimar 330e951cf0 Remove a useless XGetGeometry call, the X11 event handling already 
updates vo_dwidth/vo_dheight.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27946 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-17 13:12:01 +00:00
reimar d12df3ab12 Get rid of (besides useless assignments) unused XSizeHints variable 
in vo_xvmc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27942 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-16 17:16:08 +00:00
reimar 8cc27a3561 Remove explicit setting of vo_ontop since that is already done by vo_x11_create_vo_window 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-15 23:09:31 +00:00
reimar 55175c457d Remove now unused variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27926 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-15 19:03:21 +00:00
reimar 4b9ee2e206 Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same 
boiler-plate code with them, just with different bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-15 18:56:25 +00:00
diego c324966059 Remove duplicated prototype for XShmGetEventBase(), because 
- 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
 2008-08-09 14:56:09 +00:00
diego 82f319af62 Change a bunch of X11-specific preprocessor directives. 
Switch from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-04 06:16:23 +00:00
diego 3b31fa5717 Rename two GUI-related preprocessor directives: 
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 13:44:59 +00:00
diego ad603f5559 cosmetics: Remove useless parentheses from from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 08:33:27 +00:00
ben 531000e6ae Add a new suboption to -vo xv and -vo xvmc that allows selection 
of XVideo adaptor to be used (instead of default one, which is #0).

This is useful for example if you'd rather like to use the original
Overlay renderer of your GPU instead of the texture blitting engine
(which is usually default), which is number one cause of nasty
video tearing effects.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26762 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-13 17:52:25 +00:00
reimar 2bf8c692f1 Mark the vo_functions_t definitions as const where possible. 
This is not possible for xover and anything supporting vidix
due to horrible hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:39:15 +00:00
reimar 909887bdbe Make vo info structs const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:06:03 +00:00
diego c8ae1836e6 cosmetics: misc typo fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24615 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-25 16:34:23 +00:00
reimar e1057f5898 Remove some unused variables 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23676 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-27 10:28:38 +00:00
reimar f131aafff1 Make X11 window creation and (with -fixed-vo) management simpler and more 
consistent by introducing a new function that handles most of the
ugly things. Changes of behaviour with some vos is unavoidable, bug reports
welcome.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23675 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-27 10:26:13 +00:00