4785c2617e
Merge svn changes up to r30967
2010-04-26 17:42:20 +03:00
70c66c0476
Rename get_path.[ch] --> path.[ch].
...
These files now contain different functions related to path handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:38:27 +00:00
00323c06e2
Delete things related to old translation system
...
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
42bf12c2d3
Merge svn changes up to r30595
...
Conflicts:
mplayer.c
vidix/nvidia_vid.c
2010-03-09 23:37:00 +02:00
38b7648cac
Mark character arrays as const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30751 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 19:57:40 +00:00
676a0c121e
Remove unused variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30589 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 18:50:32 +00:00
51cc80d2dd
Use memset to initialize huge arrays.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30588 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 18:38:02 +00:00
687744dfed
Remove pointless explicit member initialization to 0 when the struct
...
is already zeroed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30587 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 18:32:31 +00:00
af356b5d15
Use calloc instead of malloc+memset
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30586 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 18:30:32 +00:00
efcc9ad712
Merge svn changes up to r30055
2009-12-18 18:54:42 +02:00
d8fed1f04c
Cosmetics: reindent
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30049 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-17 10:57:40 +00:00
1078baf9aa
The fontconfig check added in r30044 wasn't safe. This makes it more robust.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30046 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-16 22:36:17 +00:00
067b817500
Fix a crash when fontconfig is unable to select a font. e.g. if no config directory could be found.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30044 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-16 11:11:31 +00:00
0e1b7765be
Merge svn changes up to r29644
2009-09-04 19:49:35 +03:00
b125a31886
Fix memleak when using fontconfig without a font name.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29607 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 10:17:22 +00:00
a2037a2eff
Merge svn changes up to r29412
2009-07-07 02:56:01 +03:00
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
e306174952
Translation system changes part 2: replace macros by strings
...
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
b5972d6f14
Translation system changes part 1: wrap translated strings
...
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
9b57e55ee5
enable fontconfig support by default. This change takes only in effect,
...
if fontconfig support is actually compiled in.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29370 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-17 09:16:19 +00:00
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
ae2faad666
Merge svn changes up to r28951
2009-03-14 23:52:45 +02:00
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
1e86963828
Merge svn changes up to r28537
2009-02-12 04:17:55 +02: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
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
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
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
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
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
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
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
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
e1ef11f0f6
font_load_ft.c: Make tables const
2008-04-28 16:38:40 +03:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Uoti Urpala
diego
reimar
adrian
Amar Takhar
siretart
greg
eugeni
Uoti Urpala
ulion
compn
ben
ods15
uau
henry