be8c67909b
Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
...
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
2009-02-17 11:16:19 +00:00
4a8a46fafd
Fix compilation after last commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28627 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 10:13:08 +00:00
a3dbab1813
Cropping parameter to calc_src_dst_rects is const
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28626 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 08:09:36 +00:00
4ed961f7e5
100l, reset ass_border when switching out of fullscreen mode.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28625 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 08:05:14 +00:00
de53a241ed
The CONFIG_TV_TELETEXT preprocessor directive is defined/undefined,
...
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
2009-02-17 02:57:10 +00:00
991d64b31f
Fix compilation without VDPAU
...
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
2009-02-17 00:09:15 +00:00
7e9fd9351c
Add support for VDPAU video out, including hardware decoding.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 20:58:13 +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
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
dbc106f4da
Remove now unused vo_calc_drwXY function.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28547 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 18:03:38 +00: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
36d0d92f21
Only set VO_EVENT_RESIZE if size actually changed, not if e.g. the window was
...
only moved to the foreground.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28541 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 12:43:14 +00:00
49f88ad861
Conditionally compile aclib.c instead of placing #ifdef around its content.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:42:00 +00: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
ff0c8c1e35
Avoid message spam during video adapter uncooperative state.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28469 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-05 09:07:58 +00:00
680578839d
Unify info/error messages to a common style:
...
<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
2009-02-05 09:06:09 +00:00
406a602ecc
Add [gl] in front of vo_gl message
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28459 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 11:47:07 +00:00
9b8170ca54
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
...
faster without it. Change autodetection accordingly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28458 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 11:46:31 +00:00
0fcb101267
Add checks that a D3D device is available before attempting rendering.
...
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
2009-02-03 11:00:09 +00:00
cd8ef8a8f6
Remove the Present call after adapter reinitialization, it can not work anyway
...
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
2009-02-03 10:54:27 +00:00
680eb1a1e4
Cosmetics: remove empty line, improve some messages.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28454 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:21:17 +00:00
fbac650de3
Whitespace/comment typo cosmetics.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28453 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:17:14 +00:00
af87ab3afd
Check for change_d3d_backbuffer failure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28452 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:16:03 +00:00
ad8c8f6f28
Fix several return values
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28451 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:14:44 +00:00
12b7948773
Remove pointless #ifdef around internal header includes.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28436 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:40:15 +00:00
dc4b6fcddc
Make CONFIG_XVMC a proper FFmpeg-style 0/1 definition.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28402 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-30 23:58:07 +00:00
7fcf438a2f
Allocate a larger backbuffer to allow resizing without reinit.
...
Patch by Georgi Petrov [gogothebee gmail com] and Jim Hauxwell [james (at) dattrax co uk]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28379 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-27 10:02:47 +00:00
eb4a4604c0
HAVE_3DNOW --> HAVE_AMD3DNOW
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 09:29:53 +00:00
8d242b60e0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28342 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-19 17:12:43 +00:00
39cb032fd1
fix device_id option after r28165
...
patch by Adrian Stutz %adrian A sttz P ch%
Original thread:
date Fri, Jan 9, 2009 at 4:03 PM
subject [MPlayer-dev-eng] [PATCH] vo_macosx: fix device_id option after r28165
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28341 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-18 18:05:16 +00:00
f14ff6d054
100l, forgot to delete two defines left over from old HAVE_MMX handling code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28337 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 21:04:52 +00:00
97df2f9162
More #ifdef HAVE_MMX etc. missed by earlier search.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28327 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:32:54 +00:00
4abf191c5d
More #ifdef -> #if fixes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28326 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:29:20 +00:00
93d598c7b2
Lots and lots of #ifdef ARCH_... -> #if ARCH_...
...
and #ifdef HAVE_MMX etc -> #if HAVE_MMX.
There might be still more that need to be fixed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:21:21 +00:00
07fb95d10b
Change vo_draw_text to a vo_draw_text_ext function which draws DVD navigation
...
highlights at the correct position with the high-resolution OSD of -vo gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28290 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 13:47:41 +00: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
d3b5452f49
Support loading font faces other then the first one in a font file.
...
With -fontconfig, it is possible to select a face with index higher than
0 in a multi-face font file. Currently, with the old rendering code,
this information is lost and the first face is loaded. With this change,
index supplied by fontconfig is used for font loading.
Patch by Adrian Stutz, adrian sttz ch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28276 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-06 16:44:47 +00:00
diego
cehoyos
reimar
uau
iive
gogothebee
gpoirier
eugeni