RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
28,296 Commits 41 Branches 85 Tags 160 MiB
Commit Graph

344 Commits

Author SHA1 Message Date
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
diego 0864f92e7a Get rid of pointless 'extern' keywords. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 23:01:03 +00:00
Uoti Urpala e46ce9c0ac Merge svn changes up to r27899 2008-11-06 20:41:40 +02:00
reimar c1c59ce8cd Consistently use NULL for pointers instead of 0. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27876 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-02 11:48:20 +00:00
reimar 1ae7149c08 Fallback to non-fontconfig behaviour when fontconfig initialization fails. 
Also fixes a memleak in that case, bug #1313.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27875 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-02 09:57:22 +00:00
Uoti Urpala 259ea9d703 Merge svn changes up to r27573 
Conflicts:
	libmpcodecs/vd_ffmpeg.c
 2008-09-10 23:59:08 +03:00
aurel 11d6f1fd2d libass: fix type mismatch between size parameter and the way it's used 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27531 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-05 22:59:01 +00:00
aurel 81058d5af2 libass: add a new ass_process_data() to process demuxed subtitle packets 
conforming to the ASS spec


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27530 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-05 15:07:06 +00:00
Uoti Urpala e09fe1ce04 Merge svn changes up to r27458 2008-08-12 15:03:34 +03:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
eugeni e1ce107366 Don't print drawing commands on screen. 
Drawing mode is not implemented in libass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27442 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-08 20:08:02 +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
eugeni 6c857af5c0 If (has outline) blur(outline) else blur(glyph). 
If there is an outline, the glyph itself should not be blurred. Keeps
the border between glyph and outline clear (unblurred), which is
probably how it should be.

Patch by Diogo Franco (diogomfranco gmail com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27441 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 22:20:58 +00:00
eugeni a925925543 \org turns off collision detection. 
Patch by Diogo Franco (diogomfranco gmail com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27440 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 22:20:56 +00:00
eugeni 6c92d9358b Treat \h as space character. 
Patch by Robert Rudd (robrudd at users sourceforge net).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27439 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 22:20:54 +00:00
eugeni 054f28e2d1 Calculate subtitle origin in floating point. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27438 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 22:20:52 +00:00
eugeni 1670e33e21 Calculate subtitle position in floating point. 
Improves subtitle position precision from a unit of script coordinates
to a screen pixel.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27437 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 22:20:50 +00: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
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
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
eugeni 8760b0cb71 Fix \fn without an argument consuming the next '\'. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27242 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-09 15:05:56 +00:00
eugeni 88a0442765 Check if the font set returned from FcFontSort in not NULL. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27128 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-23 14:46:55 +00:00
eugeni a2bd32e4de Reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27127 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-23 14:46:52 +00:00
eugeni 839c865ad8 Only use application font dir if library->fonts_dir is not NULL. 
This can be the case if ass_set_fonts_dir() call is omitted, results in
segfault. Never happens in the current MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27126 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-23 14:46:50 +00:00
eugeni 026f3a4d0d The size of output buffer is stored in 'osize', not 'size'. 
This is just for readability, the code behaviour is not changed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26924 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-29 18:35:22 +00:00
eugeni db616d5222 Clear iconv conversion state also in libass. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26923 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-29 18:35:21 +00:00
eugeni d3e1f76cac Offset should be size_t. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26922 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-29 18:35:18 +00:00
eugeni c134dd4c8d Cosmetics: reindent after the last commit. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26857 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-22 22:52:58 +00:00
eugeni 72170ac108 Read all faces of a memory font, not just the first one. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26856 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-22 22:52:57 +00:00
eugeni 6ead8919a9 Fix compilation with FontConfig <= 2.2.96. 
It lacks FcPatternRemove function. The code will work fine, but produce an
incorrect "Selected font is not the requested one" warning in rare cases.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26851 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-22 08:58:06 +00:00
eugeni bbfb156539 In case 2 styles have the same name, prefer the latest one. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26839 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-19 18:37:27 +00:00
diego 5423c418c2 cosmetics: Remove useless parentheses from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 09:42:28 +00:00
diego ce01f2052c Speak of libass instead of MPlayer in the libass license headers. 
We already use LIBASS_ prefixes for the multiple inclusion guards.
Thus libass can be considered separate enough to warrant this.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26770 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-14 17:21:58 +00:00
diego f025ffda0b Add standard license header. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26757 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-13 08:34:59 +00:00
diego 1c0dcbce19 Fix one more license header wording detail for consistency. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26756 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-13 08:33:48 +00:00
diego 256060a3ae Use standard license header. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26755 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-13 08:02:23 +00:00
eugeni 8a5ba8d99c When building font pattern, treat both ' ' and '-' as word separators. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26742 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-11 20:17:21 +00:00
eugeni 38836c7837 Fix possible free of unallocated memory. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26741 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-11 19:49:57 +00:00
eugeni 2c9139be84 Define FC_FULLNAME and FC_EMBOLDEN to fix compilation with ancient fontconfig. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26692 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-08 13:54:00 +00:00
eugeni 263c691380 If both full name and family are available, use the former in inexact match warning. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26691 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-08 13:53:58 +00:00
eugeni 4805407960 Remove extra family names from the search pattern after FcFontSort and 
call FcFontRenderPrepare to select the best family name for the font in case
there are several of them.

This does not affect font matching results, but helps to avoid warning about
inexact match.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26690 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-08 13:53:56 +00:00
ulion fbf6dafd00 Fix the second fontconfig_init function as the declaration in the .h file. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26652 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-03 12:44:16 +00:00
eugeni 479b726386 Print more info about selected font. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26648 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-02 23:32:29 +00:00
eugeni cbf77e3e9f Rewrite font family check in a simpler way. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26647 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-02 23:32:28 +00:00
eugeni 9a20a76b06 Move font family check to the end of the list. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26646 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-02 23:32:26 +00:00
eugeni 97972596e8 Cosmetics: rename local variables to better reflect their contents. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26645 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-02 23:32:25 +00:00
eugeni 76e851e4ee Skip '@' at the beginning of the font name. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26625 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 11:06:16 +00:00
eugeni 19c9e0aceb Only warn if both font family and it's full name are different from requested. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26624 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 00:34:29 +00:00
eugeni 54d3bcce0b Allow inexact font family matching. 
In SSA/ASS fonts are sometimes referenced by their "full name",
which is usually a concatenation of family name and font
style (ex. Ottawa Bold). Full name is available from
FontConfig pattern element FC_FULLNAME, but it is never
used for font matching.
Therefore, I'm removing words from the end of the name one
by one, and adding shortened names to the pattern. It seems
that the first value (full name in this case) has
precedence in matching.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26623 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 00:34:26 +00:00
eugeni f1e8cbf643 Remove libass dependency on global font_fontconfig variable. 
A new function (ass_set_fonts_nofc) is introduced instead of an extra argument
to existing ass_set_fonts to keep binary compatibility with older versions of
the library.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26614 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-30 14:16:22 +00:00