1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Commit Graph

87 Commits

Author SHA1 Message Date
Clément Bœsch
699bf9dcd3 vo_dga: replace xf86dga.h with Xxf86dga.h
xf86dga.h is deprecated and may be removed in the future.
2011-04-20 04:22:53 +03:00
Uoti Urpala
c9026cb321 sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03: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
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
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
Uoti Urpala
de56d2d9f5 Remove variable arguments from vo control() functions
No voctrl uses them any more, and using them would not be a good idea
because it makes forwarding arguments to other functions harder.
2008-04-23 13:41:03 +03:00
diego
e59291d5a9 Replace "all rights reserved" statement with standard GPL license header.
Done with the permission of Andreas Ackermann, the author of the file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26432 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 09:09:36 +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
e364249f21 Remove unused variables, patch by Stefan Huehner, stefan ##at## huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18981 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 16:01:36 +00:00
rathann
2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
diego
d34494074c Slightly reduce unnecessary verbosity.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16302 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-24 00:46:04 +00:00
ivo
cd55954e4e Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's
changed to int now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16172 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 01:24:37 +00:00
henry
dbb001bae2 replace VO and VF numeric flags with #defined identifiers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-18 15:52:38 +00:00
rfelker
7a58560c9a no effect in practice, but strides should always be signed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14796 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-24 17:07:49 +00:00
diego
5b0d96c6b4 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13788 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-28 01:15:53 +00:00
attila
0e4e21aac5 major reindentation of x11 code try #2
note that this is plain ident output, i didnt tweak it by
hand like the last attempt.

if anyone is interested in the indent profile i used, just drop me a mail.

please contact me on irc on how to send me my share of cola,
but be aware that i will only accept swiss or german cola, as the japanese is
way to sweet :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12583 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-14 04:53:03 +00:00
diego
7ea36434ae DOCS/en/ ---> DOCS/HTML/en/
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11184 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-19 21:15:23 +00:00
gabucino
fadce2d781 many small typo and grammar fixes
Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11001 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-04 17:29:08 +00:00
alex
f2fcef603c 10l & warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10496 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-28 14:54:19 +00:00
diego
339e4f20af Add missing language suffix to DOCS/ path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10287 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-13 01:25:11 +00:00
alex
6f79aca2eb final scaler removal step
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10235 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-01 22:09:20 +00:00
alex
a0fce62fd3 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10213 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-30 18:05:49 +00:00
alex
89224f2c91 Spring cleanup: removed the full yv12 support as it was broken anyway. The BGR/RGB native/non-native case needs some cleanup, too. Currently it works for me (tm)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10022 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-29 17:15:14 +00:00
alex
cdb7ff9cd0 10l, avoid getting num_of_buffers=0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9275 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-04 16:14:54 +00:00
alex
6811f96358 removed get_info, using the same sheme as in libmpcodecs instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8149 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-11 15:22:10 +00:00
arpi
f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
pontscho
a007cfa113 arpi add direct render support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8085 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 15:14:36 +00:00
pontscho
7629b452db - cleanup
- add fixed-vo support

please test, this is working for me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8068 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 00:39:28 +00:00
arpi
39fe4d0cd3 verbose can be negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-01 17:46:45 +00:00
arpi
5a473a4ffc mode detection && vo_init() moved to preinit()
NOTE: this driver needs some cleanup, and should use mDisplay/mScreen


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7931 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-27 03:15:48 +00:00
arpi
99fbc21507 DGA1 trivial fix by Fredrik Noring <noring@nocrew.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7653 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 11:29:19 +00:00
arpi
c9948174b9 flickering fix, patch by Fredrik Noring <noring@nocrew.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7576 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-01 21:47:32 +00:00
arpi
dbb902acc6 -nograbpointer, based on old patch by Christian Ohm <chr.ohm@gmx.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7540 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-28 20:09:14 +00:00
arpi
baefead944 another dga v1 fix by Fredrik Noring <noring@nocrew.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7534 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-28 18:50:45 +00:00
arpi
21b6169342 DGA1 fix by Fredrik Noring <noring@nocrew.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7516 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-27 20:48:06 +00:00
arpi
8adea7878e fixes problem with video image alignment.
patch by Fredrik Noring <noring@nocrew.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7501 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-25 21:41:42 +00:00
arpi
09dd35390d cosmetics...
- made some internal funcs static
- removed spaces & obsolete comment at the end
- removed cvs log from header
- different driver name if no XF86VidMode avail.
- removed vd_printf, use mp_msg() instead


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7500 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-25 21:18:43 +00:00
arpi
bdea79cea4 Attached patch improves the vertical retrace synchronisation (vsync)
of the mplayer DGA driver.
It implements a more general buffer scheme than double buffers that
allows for deeper buffer queues.

by Fredrik Noring <noring@nocrew.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7499 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-25 21:08:44 +00:00
alex
64bedd9683 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7125 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 21:32:32 +00:00
alex
7829f8bba4 revised query_format. added support for native/conversion detection
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6207 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-27 17:14:13 +00:00
nick
5ddd8e92a1 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4738 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-17 08:24:43 +00:00
michael
4cd0f2201a use mem2agpcpy_pic()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4714 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-15 01:00:26 +00:00
michael
859ae44c0a use mem2agpcpy() instead of fast_memcpy()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4683 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-12 23:19:37 +00:00
arpi
4b33dccb25 10000hl to Holm... control MUST BE static...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4597 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-09 01:21:48 +00:00
arpi
7c51652a1b query_ stuff replaced by new control() - patch by David Holm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4593 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-09 00:47:26 +00:00
alex
3807f396a5 removed obsoleted Terminate_Display_Process
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4440 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-31 11:45:25 +00:00
nick
b587a3d642 new info for tuning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4434 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-31 09:57:13 +00:00