1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 21:12:23 +00:00
Commit Graph

35 Commits

Author SHA1 Message Date
Uoti Urpala
852570d342 Merge svn changes up to r30216 2010-01-08 02:39:39 +02:00
diego
620ab70745 Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30208 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 19:04:33 +00:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
Uoti Urpala
1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02: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
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
eugeni
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
d19fef9187 Conditionally define render_one_glyph and kerning dummy functions in
font_load.c when FreeType is not enabled instead of conditionally
defining them in font_load.h. This moves the workaround closer to
where the actual problem is.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28235 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 14:41:38 +00: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
091d352d06 Rename font-related preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:36:07 +00:00
Uoti Urpala
0e85dc0f32 Move global sub_font to OSD struct 2008-06-24 08:29:36 +03:00
diego
4147306650 Give name to font_desc struct, patch by Bryan Henderson, giraffedata gmail com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27045 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-09 09:37:25 +00:00
diego
8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
diego
fe9ec3ffdd Consistently use uppercase filename as multiple inclusion guard.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 01:32:52 +00:00
reimar
fbae3928cd Allow independent scaling of vo_font and sub_font.
Patch by Guillaume LECERF (foxcore gmail com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25879 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 15:14:02 +00:00
diego
d53ff2ca72 Consistently use just the name of the #ifdef directive in #endif comments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25574 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 20:00:20 +00:00
diego
3e9e4acd8d Do not use leading underscores in multiple inclusion guards, they are reserved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 22:34:45 +00:00
ben
194fc1b15b add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-20 16:10:45 +00:00
eugeni
b21382fa5b Make blur() public. Will be used in libass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19853 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 13:32:19 +00:00
reynaldo
4728357b58 Marks several string parameters as const when they are not modified in the function, Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18985 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 17:45:36 +00:00
rathann
e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
henry
ec87c7239c freetype build fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11501 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-20 16:25:40 +00:00
arpi
c8b0ddfe4e these patches let ,,oldstyle'' and freetype subtitle renderers live
together happily. if an oldstyle subtitle (font.desc) is found, it will
be used. otherwise mplayer will choose subfont.ttf, if freetype was
detected during ./configure.
(also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too)
patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-29 14:59:23 +00:00
arpi
5531d33220 2*100l, extern fv() {} is nonsense, you have to decide if it is extern or
local but never both!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7166 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-30 13:53:27 +00:00
pontscho
4d85b357f8 add Jindrich Makovicka <makovick@KMLinux.fjfi.cvut.cz> freetype patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7141 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-29 17:35:21 +00:00
arpi
fd44bbee3d freetype 2.0/2.1+ support - disabled by default until bugs fixed
patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7123 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 20:52:02 +00:00
arpi
1ca2d5b055 .raw width>=65536 support by Georgi Georgiev <chutz@chubaka.homeip.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5929 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-02 01:56:28 +00:00
arpi
2eba558fcd moved font_laod.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5295 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-24 00:32:13 +00:00
arpi
7882ea9bad Applied DATADIR patch by Vladimir Kushnir
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1354 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-07-20 00:01:09 +00:00
arpi_esp
e3d4468a24 better .smi support and display two-byte characters- patch by Sunjin Yang
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@707 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-06 02:26:17 +00:00
arpi_esp
bfa6c4f83a printf's only if verbose>1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@340 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-04-11 00:47:05 +00:00
arpi_esp
14528e299a font alpha resampling, see -ffactor
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@216 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-25 20:38:14 +00:00
arpi_esp
89b069cae3 desc fileformat changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@215 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-25 19:10:52 +00:00
arpi_esp
54afa85eef subtitle+OSD font support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@214 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-25 04:28:40 +00:00