0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Commit Graph

54 Commits

Author SHA1 Message Date
Uoti Urpala
ae2faad666 Merge svn changes up to r28951 2009-03-14 23:52:45 +02:00
greg
708819105f Change default OSD/subtitle font sizes.
This was discussed on -dev-eng and IRC. The consensus seems to be that
3-4% of the diagonal is a good default, and most people use something
along these lines.
The subtitle font size is set to 3.5% and the OSD is kept a little bigger
with 4%.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28900 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 01:48:42 +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
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
6cce822505 Merge svn changes up to r27399
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
2008-08-02 22:04:35 +03:00
diego
d17f9943af Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-01 20:28:58 +00:00
Uoti Urpala
04f3909a72 Merge svn changes up to r27374
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
2008-07-30 16:39:24 +03:00
diego
4b141479da Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
Uoti Urpala
e1ef11f0f6 font_load_ft.c: Make tables const 2008-04-28 16:38:40 +03: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
ulion
5ad67a4f7c Set freetype flag in the font_desc_t when using a freetype font.
Patched by Guillaume LECERF <foxcore A gmail P com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25640 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 13:29:13 +00:00
ulion
4f4c08415c Fix libass to support -nofontconfig.
For history reason, fontconfig is auto-enabled when ass is enabled,
we keep this behavior and document it clearly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25379 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-12 10:00:34 +00:00
compn
82eef16f4d move errors and a warning to help_mp-en.h
so they can be translated.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24892 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-30 13:15:41 +00:00
diego
84157efa5a Clean up the way get_path is handled: Compile get_path.c to an object to link
against instead of directly #including the C file and replace the many extern
declarations by a proper header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 11:20:24 +00:00
reimar
19a1049830 Remove unused function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23654 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 14:11:38 +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
ods15
6b64c8274e gcc 2.95 fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21622 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-15 08:20:05 +00:00
reimar
18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
reimar
f5f7bb1ccb Properly free fontconfig patterns
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21517 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 11:28:49 +00:00
diego
cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
uau
544233bded Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:21:16 +00:00
henry
3a0f1fa219 changed email address
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20662 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 10:21:52 +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
reimar
615166ab61 Avoid large amounts of data on the stack (> 900k on 64 bit systems).
Patch by Tobias Diedrich (ranma at tdiedrich de) with minor modifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19213 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 13:50:08 +00:00
diego
16279f8128 unused variable warning fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19210 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 08:20:31 +00:00
diego
0bdf40e5cc Fixes the format string for the warning message on line 182 (%x
with long argument, %c with long argument).
Also, font_load_ft calls iconv with int pointers instead of size_t
pointers for (in|out)bytesleft.
patch by Tobias Diedrich, ranma ##at## tdiedrich ##dot## de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19209 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 08:10:37 +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
uau
5c9b90d7a1 Make some functions static.
Patch by Stefan Huehner, stefan at huehner org.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18955 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 15:26:36 +00:00
reynaldo
132173bbf0 get_path as const, patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18894 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 23:27:37 +00:00
reynaldo
9d9a15d185 rm unnecesary casts from void* - part 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18883 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-02 03:59:36 +00:00
diego
bc93e25299 Move conditional FreeType support compilation to the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18869 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-30 12:41:05 +00:00
albeu
1bfd7289f8 NEVER assign static strings to string command line options.
Fix crash on exit with fontconfig.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-26 19:10:43 +00:00
albeu
35e90f1556 The fix in mp_msg.c avoids a core dump when iconv_open() fails, the other
just makes it possible to compile if USE_ICONV is undefined.

Patch by Bjorn Sandell (biorn _At_ chalmers _Dot_ se).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17932 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 02:31:29 +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
d2e7c10efd enable hinting
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15441 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-13 19:47:50 +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
reimar
95efc9ce47 fixed small memleaks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13633 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-13 16:22:59 +00:00
alex
85f98092f5 100l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11585 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 13:30:30 +00:00
alex
e7d9078afc Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11581 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 12:14:32 +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
ed9296d845 renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10273 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-09 12:15:48 +00:00
henry
142ebc5c38 better fix of vo_aa font segfault
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9177 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-30 19:58:43 +00:00
henry
cbe477614e another sanity check against vo_aa font hack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9173 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-30 18:43:08 +00:00
filon
5ba5288d2e Use standard mplayer message funtion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8819 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-06 12:23:59 +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
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