Uoti Urpala
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
Uoti Urpala
1db1773ec2
Merge svn changes up to r29277
2009-05-08 23:50:26 +03:00
reimar
d6cf125d94
Change getdladdr to always use dlopen, dlsym and then dlclose.
...
Performance is not really important and dlsym(0, ...) is
not defined while the more correct dlsym(RTLD_DEFAULT, ...)
is a GNUism (although POSIX does reserve RTLD_DEFAULT).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29224 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 10:18:32 +00:00
Uoti Urpala
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
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
Uoti Urpala
cb3dc68691
Merge svn changes up to r28103
2008-12-06 02:16:51 +02:00
reimar
b6e113841c
Add experimental support for glXAllocateMemoryMESA
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 22:16:45 +00:00
reimar
0ca415447d
Add support for YCBCR MESA texture format to vo_gl.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28093 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 15:36:54 +00:00
Uoti Urpala
8c144171bb
Merge svn changes up to r28087
...
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
2008-12-04 01:55:52 +02:00
reimar
a3e78418b9
Cosmetics, whitespace and "... == NULL" to "!..."
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28070 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 09:58:11 +00:00
Uoti Urpala
1715c2a336
Merge svn changes up to r27949
...
Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c
2008-11-17 20:50:23 +02:00
reimar
87bee02b19
Replace some of the different inconsistent XGetGeometry uses by a
...
vo_x11_update_geometry function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27919 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:45:55 +00:00
Uoti Urpala
e46ce9c0ac
Merge svn changes up to r27899
2008-11-06 20:41:40 +02:00
reimar
14eb21fce0
For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of GL_MAX_TEXTURE_UNITS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27899 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-06 18:39:37 +00:00
Uoti Urpala
ebb4abf208
Merge svn changes up to r27682
...
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
2008-10-02 05:17:23 +03:00
reimar
10dc2e1429
Fix glAdjustAlignment parameter in glCreateClearTex
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27654 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-20 19:41:13 +00:00
reimar
0e99017da9
Change glCreateClearTex to use the same host data format as later uploads.
...
This fixes at least some of the massive performance problems the ATI drivers have.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27653 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-20 17:48:01 +00:00
Uoti Urpala
259ea9d703
Merge svn changes up to r27573
...
Conflicts:
libmpcodecs/vd_ffmpeg.c
2008-09-10 23:59:08 +03:00
diego
3311a2ae9c
Replace casual GPL notices by proper license headers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 14:09:51 +00:00
Uoti Urpala
d5c868325c
Merge svn changes up to r26979
...
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
2008-06-04 08:10:48 +03:00
reimar
6701227e16
Simplify yuv to rgb conversion matrix stuff.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26871 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 12:10:08 +00:00
reimar
5ba240c875
Cosmetics: align
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26870 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 11:31:49 +00:00
reimar
54f9e2b03d
update doxygen comments
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26869 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 11:25:57 +00:00
reimar
6689fe364e
Add a filter strength parameter for blurring/sharpening scalers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26868 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 11:19:38 +00:00
reimar
056b5b9457
Use a struct instead of a huge and further growing argument list.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26866 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 11:03:00 +00:00
Uoti Urpala
26039a38e3
Move global mDisplay to x11 state struct
2008-04-23 13:46:34 +03:00
reimar
5979388565
Fix and simplify lscale=2 (bicub_x) scaler, produced funny
...
noise on ATI cards due to cdelta.y never being set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26227 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-12 15:17:06 +00:00
reimar
7a6d302f42
Try harder to find OpenGL functions on Windows.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25985 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 19:37:47 +00:00
reimar
174aeba480
Allow for larger fragment programs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25913 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 18:00:20 +00:00
reimar
ae813d2b37
Fix a coefficient for lscale=5 OpenGL mode
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25797 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 14:20:56 +00:00
reimar
b5186a059e
Simplify and silence lots of warnings
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25790 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 11:09:33 +00:00
reimar
34565b09a6
Fix using both lscale and cscale 4
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 10:10:05 +00:00
reimar
6a6c3d8cbc
Add a fragment program for 5x5 unsharp masking
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25786 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-18 19:05:29 +00:00
reimar
932f9595bb
Remove leftover backslash
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25785 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-18 18:38:02 +00:00
reimar
3521950ba9
Simplify
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25784 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-18 18:37:18 +00:00
reimar
09e3d23298
Use the same unsharp filter template for 2D and RECT textures
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25783 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-18 18:34:10 +00:00
reimar
da44633714
Fix OpenGL unsharp filter
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25773 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-16 20:36:01 +00:00
reimar
45c0df9bcb
Create/allocate conversion textures before scaler textures.
...
Allows overriding gamma ramp texture also when using a non-trivial scaler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25758 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-15 18:14:00 +00:00
reimar
1fbd767ef6
Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25757 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-15 17:59:20 +00:00
reimar
649027b817
Add a forgotten case to create_scaler_textures, avoids an incorrect warning.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25755 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-15 17:51:21 +00:00
reimar
0375e5fe2b
Fix typo in comment
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24805 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-18 12:39:59 +00:00
reimar
dc804a9536
Add a bicubic scaler that needs a lot more instruction but no
...
extra texture lookup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24338 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-04 10:46:31 +00:00
reimar
7b9f20c0ab
Fix compilation after patch to remove global vo_hdc
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24335 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-03 13:18:26 +00:00
reimar
e1e588421f
Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24334 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-03 08:44:36 +00:00
reimar
c9c2f7332e
Add a new GPU-based scaling method to vo gl
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22507 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 14:59:08 +00:00
reimar
5c656ebbc8
The fragment program functions are and most likely always will be ARB-only,
...
so do not check for other function name variants.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22344 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 16:07:51 +00:00
reimar
29a164309f
Fix compilation under MinGW with X11 enabled
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-17 12:33:09 +00:00
reimar
4f6a65ef4e
Avoid void * arithmetic
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21217 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 13:34:55 +00:00
reimar
7df98a0a3d
Put files fully owned by my under GPL v2 "or later"
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 10:03:33 +00:00
reimar
b0b702f667
Some more documentation
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19226 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 19:37:49 +00:00