e913d6c5da
Merge svn changes up to r31004
2010-04-26 17:55:05 +03:00
86641ee41e
Use (void) instead of () to indicate a parameterless function, fixes:
...
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
2010-03-28 16:58:27 +00:00
13221a7165
Merge svn changes up to r30663
...
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
2010-03-10 00:13:11 +02:00
d306b727b1
Remove pointless '#if 1' preprocessor directives.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 10:22:29 +00:00
231b33a02f
Merge svn changes up to r30165
2010-01-08 01:05:30 +02:00
f102ac7a8c
Fix function declarations to avoid casting function pointers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 13:18:49 +00:00
87366694d8
Remove the internal GUI
...
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.
2009-07-07 21:49:42 +03:00
cf9edda1d3
Merge svn changes up to r29117
2009-04-01 02:43:47 +03:00
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
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
ae2faad666
Merge svn changes up to r28951
2009-03-14 23:52:45 +02:00
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
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
ebb541c655
Merge svn changes up to r28690
2009-02-21 17:39:30 +02:00
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
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
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
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
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
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
186e5a998c
Merge svn changes up to r28641
...
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.
2009-02-18 01:45:36 +02:00
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
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
0bf2bd91ec
Merge svn changes up to r28610
2009-02-16 02:39:58 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
738f66b1bc
Merge svn changes up to r28549
2009-02-13 03:52:51 +02:00
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
1e86963828
Merge svn changes up to r28537
2009-02-12 04:17:55 +02:00
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
9bcd12fdf5
Merge svn changes up to r28310
...
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.
2009-01-15 05:57:31 +02:00
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
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
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
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
835511ac39
Merge svn changes up to r28038
2008-11-25 21:12:01 +02:00
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
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
6cbca28085
Merge svn changes up to r27979
2008-11-22 19:16:43 +02:00
Uoti Urpala
diego
reimar
Anton Khirnov
iive
cehoyos