]> granicus.if.org Git - libass/log
libass
18 years agoFix width -> orig_width typo.
eugeni [Sun, 29 Oct 2006 13:59:36 +0000 (13:59 +0000)]
Fix width -> orig_width typo.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20513 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoDon't set PlayResX for plaintext subtitles.
eugeni [Sun, 29 Oct 2006 13:58:30 +0000 (13:58 +0000)]
Don't set PlayResX for plaintext subtitles.
This way font proportions will not depend on frame aspect.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20512 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd \N at the end of each subtitle line when converting from subdata.
eugeni [Sun, 29 Oct 2006 13:52:51 +0000 (13:52 +0000)]
Add \N at the end of each subtitle line when converting from subdata.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20511 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoLibass interface reworked:
eugeni [Sat, 28 Oct 2006 15:07:18 +0000 (15:07 +0000)]
Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoIf HAVE_FONTCONFIG is not defined, font_fontconfig might be declared both
reimar [Sat, 28 Oct 2006 10:21:30 +0000 (10:21 +0000)]
If HAVE_FONTCONFIG is not defined, font_fontconfig might be declared both
extern and static, causing compilation to fail

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20485 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd missing fontconfig_done() call.
eugeni [Fri, 27 Oct 2006 16:02:44 +0000 (16:02 +0000)]
Add missing fontconfig_done() call.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20467 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSplit ass_configure() into several smaller functions.
eugeni [Thu, 26 Oct 2006 20:08:46 +0000 (20:08 +0000)]
Split ass_configure() into several smaller functions.
FontConfig initialization moved from ass_init() to ass_set_fonts().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20462 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoDon't forget to apply scaling coefficients to kerning values.
eugeni [Fri, 20 Oct 2006 23:06:52 +0000 (23:06 +0000)]
Don't forget to apply scaling coefficients to kerning values.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20326 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix center of rotation calculation. It was overly complex and
eugeni [Thu, 19 Oct 2006 18:08:44 +0000 (18:08 +0000)]
Fix center of rotation calculation. It was overly complex and
incorrect for right- and center-aligned text.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20308 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCenter of rotation depends on alignment.
eugeni [Wed, 18 Oct 2006 21:19:51 +0000 (21:19 +0000)]
Center of rotation depends on alignment.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20302 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSupport separate rotation angle for each glyph.
eugeni [Wed, 18 Oct 2006 21:11:29 +0000 (21:11 +0000)]
Support separate rotation angle for each glyph.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20301 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMove base point calculation to a separate function. Will be reused soon.
eugeni [Wed, 18 Oct 2006 18:33:19 +0000 (18:33 +0000)]
Move base point calculation to a separate function. Will be reused soon.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20300 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: remove commented code.
eugeni [Wed, 18 Oct 2006 17:57:00 +0000 (17:57 +0000)]
Cosmetics: remove commented code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20299 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix a typo in collision detection code.
eugeni [Wed, 18 Oct 2006 15:52:26 +0000 (15:52 +0000)]
Fix a typo in collision detection code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20297 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoRemove an outdated debug message.
eugeni [Mon, 16 Oct 2006 19:02:11 +0000 (19:02 +0000)]
Remove an outdated debug message.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20275 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix crash because of last_glyph < first_glyph, probably caused by first line
reimar [Sun, 15 Oct 2006 13:03:43 +0000 (13:03 +0000)]
Fix crash because of last_glyph < first_glyph, probably caused by first line
only consisting of '\n'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20232 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoZerofill libass static variables during initialization.
eugeni [Sat, 14 Oct 2006 14:42:23 +0000 (14:42 +0000)]
Zerofill libass static variables during initialization.
Patch by Jindrich Makovicka <makovick a gmail d com>.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20208 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFree FT_Stroker during libass deinitialization.
eugeni [Sat, 14 Oct 2006 14:35:33 +0000 (14:35 +0000)]
Free FT_Stroker during libass deinitialization.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20207 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReduce margins for plaintext subtitles.
eugeni [Mon, 9 Oct 2006 19:57:56 +0000 (19:57 +0000)]
Reduce margins for plaintext subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20144 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAvoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is broken)
reimar [Sun, 8 Oct 2006 13:01:14 +0000 (13:01 +0000)]
Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is broken)
and warn that these are beta versions and not supported.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20111 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd copyright notice and vim/emacs comments to libass and vf_ass.c.
eugeni [Sun, 1 Oct 2006 17:09:04 +0000 (17:09 +0000)]
Add copyright notice and vim/emacs comments to libass and vf_ass.c.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20014 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: add some comments.
eugeni [Sun, 24 Sep 2006 16:15:47 +0000 (16:15 +0000)]
Cosmetics: add some comments.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19972 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoShadow support in libass.
eugeni [Sun, 24 Sep 2006 16:04:37 +0000 (16:04 +0000)]
Shadow support in libass.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19971 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFree memory in ass_synth_done().
eugeni [Sun, 24 Sep 2006 15:50:31 +0000 (15:50 +0000)]
Free memory in ass_synth_done().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19968 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReduce size of non-blurred bitmaps.
eugeni [Sat, 23 Sep 2006 18:35:19 +0000 (18:35 +0000)]
Reduce size of non-blurred bitmaps.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19962 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics. Change indentation of block of code to make it consistent with
eugeni [Sat, 23 Sep 2006 17:54:24 +0000 (17:54 +0000)]
Cosmetics. Change indentation of block of code to make it consistent with
the rest of the file.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19961 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBetter fix_outline implementation. No more "fix_outline failed" messages,
eugeni [Sat, 23 Sep 2006 00:15:00 +0000 (00:15 +0000)]
Better fix_outline implementation. No more "fix_outline failed" messages,
should work even with the craziest glyphs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19947 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix width -> orig_width typo causing subtitles to be too far to the right
reimar [Fri, 22 Sep 2006 20:47:08 +0000 (20:47 +0000)]
Fix width -> orig_width typo causing subtitles to be too far to the right
for movies with vertical black bars (aspect < monitoraspect).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19946 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMove calculation of text parameters (number of lines, height, etc.) from
eugeni [Fri, 22 Sep 2006 18:56:09 +0000 (18:56 +0000)]
Move calculation of text parameters (number of lines, height, etc.) from
wrap_lines_smart() into a separate function. Call it for every event, even
those that do not require line wrapping.

This fixes randomly wrong positioning of 'Banner' events.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19938 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMove variable declaration to a more deeply nested block. It is not used outside of it.
eugeni [Fri, 22 Sep 2006 18:47:29 +0000 (18:47 +0000)]
Move variable declaration to a more deeply nested block. It is not used outside of it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19937 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: fix indentation after last commit.
eugeni [Thu, 21 Sep 2006 22:37:42 +0000 (22:37 +0000)]
Cosmetics: fix indentation after last commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19925 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix FT_Stroker use in libass. The previous variant ended up with 0-width
eugeni [Thu, 21 Sep 2006 22:36:47 +0000 (22:36 +0000)]
Fix FT_Stroker use in libass. The previous variant ended up with 0-width
outline in some cases.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19924 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoIn r19831, font size multiplier was mistakenly applied to border width.
eugeni [Thu, 21 Sep 2006 19:31:28 +0000 (19:31 +0000)]
In r19831, font size multiplier was mistakenly applied to border width.
Fixed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19923 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSort events by ReadOrder (if both layer and start time are equal).
eugeni [Tue, 19 Sep 2006 18:23:36 +0000 (18:23 +0000)]
Sort events by ReadOrder (if both layer and start time are equal).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19912 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSet ReadOrder values for external subtitles.
eugeni [Tue, 19 Sep 2006 18:22:44 +0000 (18:22 +0000)]
Set ReadOrder values for external subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19911 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCalculate text bounding box in such way that it does not depend on the height
eugeni [Tue, 19 Sep 2006 17:40:31 +0000 (17:40 +0000)]
Calculate text bounding box in such way that it does not depend on the height
of individual glyphs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19910 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: fix indentation after last commit.
eugeni [Tue, 19 Sep 2006 13:07:45 +0000 (13:07 +0000)]
Cosmetics: fix indentation after last commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19908 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoDon't call FcDirScan/FcDirSave with FontConfig >= 2.4.
eugeni [Tue, 19 Sep 2006 13:06:44 +0000 (13:06 +0000)]
Don't call FcDirScan/FcDirSave with FontConfig >= 2.4.
Font cache is updated automatically in FcConfigAppFontAddDir.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19907 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix a stupid bug in list concatenation.
eugeni [Mon, 18 Sep 2006 18:54:38 +0000 (18:54 +0000)]
Fix a stupid bug in list concatenation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19897 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReduce code duplication in init_render_context().
eugeni [Sun, 17 Sep 2006 15:32:01 +0000 (15:32 +0000)]
Reduce code duplication in init_render_context().
Don't use glyph stroker for borderless glyphs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19879 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSubtract glyph bitmap from outline bitmap.
eugeni [Sat, 16 Sep 2006 19:01:56 +0000 (19:01 +0000)]
Subtract glyph bitmap from outline bitmap.
It greatly improves display of glyphs with semitransparent primary color.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19862 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd \be (blur edges) support to libass.
eugeni [Sat, 16 Sep 2006 13:32:46 +0000 (13:32 +0000)]
Add \be (blur edges) support to libass.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19854 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoStore bitmap glyphs in a separate struct, instead of FreeType's internal buffer.
eugeni [Sat, 16 Sep 2006 13:08:17 +0000 (13:08 +0000)]
Store bitmap glyphs in a separate struct, instead of FreeType's internal buffer.
This is required for various bitmap modifications (like blur, outline and shadow).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19852 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMake font outline width proportional to movie resolution.
eugeni [Wed, 13 Sep 2006 15:35:10 +0000 (15:35 +0000)]
Make font outline width proportional to movie resolution.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19831 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBugfix: timing for empty karaoke words was lost, resulting
eugeni [Wed, 6 Sep 2006 17:32:31 +0000 (17:32 +0000)]
Bugfix: timing for empty karaoke words was lost, resulting
in faster than normal karaoke playback.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19722 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoWorkaround for broken fonts with bad ascender/descender.
eugeni [Tue, 5 Sep 2006 20:06:20 +0000 (20:06 +0000)]
Workaround for broken fonts with bad ascender/descender.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19699 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoChange \fad behaviour so that it does not get cancelled by \r.
eugeni [Tue, 5 Sep 2006 19:06:15 +0000 (19:06 +0000)]
Change \fad behaviour so that it does not get cancelled by \r.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19698 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSimplification.
eugeni [Tue, 5 Sep 2006 18:33:31 +0000 (18:33 +0000)]
Simplification.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19697 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd vertical clipping for subtitles that were moved because of a collision.
eugeni [Mon, 4 Sep 2006 17:55:57 +0000 (17:55 +0000)]
Add vertical clipping for subtitles that were moved because of a collision.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19670 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix possible unallocated memory read in libass line wrapping code.
eugeni [Mon, 4 Sep 2006 17:52:28 +0000 (17:52 +0000)]
Fix possible unallocated memory read in libass line wrapping code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19669 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoApply -ass-force-style also to matroska plaintext subs.
eugeni [Sun, 3 Sep 2006 17:57:41 +0000 (17:57 +0000)]
Apply -ass-force-style also to matroska plaintext subs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19660 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: restore indentation after recent changes.
eugeni [Sun, 3 Sep 2006 17:44:25 +0000 (17:44 +0000)]
Cosmetics: restore indentation after recent changes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19659 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd -ass-styles option. It allows to load styles from a file and use them
eugeni [Sun, 3 Sep 2006 17:42:31 +0000 (17:42 +0000)]
Add -ass-styles option. It allows to load styles from a file and use them
for plain text subtitles rendering.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19658 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix last commit.
eugeni [Sun, 3 Sep 2006 17:36:29 +0000 (17:36 +0000)]
Fix last commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19657 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMore checks in ass_render_event.
eugeni [Sun, 3 Sep 2006 17:25:04 +0000 (17:25 +0000)]
More checks in ass_render_event.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19656 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoRemove unneeded variable.
eugeni [Sun, 3 Sep 2006 17:09:53 +0000 (17:09 +0000)]
Remove unneeded variable.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19655 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoass-color and ass-border-color options.
eugeni [Sun, 3 Sep 2006 12:18:49 +0000 (12:18 +0000)]
ass-color and ass-border-color options.
Only plain text subtitles are affected.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19652 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd support for rendering matroska plaintext subtitles with libass.
eugeni [Sat, 2 Sep 2006 20:46:26 +0000 (20:46 +0000)]
Add support for rendering matroska plaintext subtitles with libass.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19649 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoDon't sort events when reading external subs. With r19644, the order does not matter.
eugeni [Sat, 2 Sep 2006 19:21:40 +0000 (19:21 +0000)]
Don't sort events when reading external subs. With r19644, the order does not matter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19645 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBetter collision detection algorithm. The idea is to keep a subtitle in place
eugeni [Sat, 2 Sep 2006 19:17:32 +0000 (19:17 +0000)]
Better collision detection algorithm. The idea is to keep a subtitle in place
when a lower placed one disappears, thus improving readability.
As a side effect, layers are supported now.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19644 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoRemove some unused code.
eugeni [Sat, 2 Sep 2006 18:33:51 +0000 (18:33 +0000)]
Remove some unused code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19642 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoRead layer info from external subs.
eugeni [Sat, 2 Sep 2006 18:10:04 +0000 (18:10 +0000)]
Read layer info from external subs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19641 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMake \fr* parameter a floating point value.
eugeni [Fri, 1 Sep 2006 20:36:38 +0000 (20:36 +0000)]
Make \fr* parameter a floating point value.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19628 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBugfix: potential write of unallocated memory.
eugeni [Thu, 31 Aug 2006 22:45:20 +0000 (22:45 +0000)]
Bugfix: potential write of unallocated memory.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19618 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBugfix: wrong height value used in font size calculation.
eugeni [Thu, 31 Aug 2006 20:19:19 +0000 (20:19 +0000)]
Bugfix: wrong height value used in font size calculation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19616 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoChange default font family and color for plain text subs.
eugeni [Tue, 29 Aug 2006 21:14:57 +0000 (21:14 +0000)]
Change default font family and color for plain text subs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19598 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoBugfix: strdup of NULL value.
eugeni [Tue, 29 Aug 2006 18:15:48 +0000 (18:15 +0000)]
Bugfix: strdup of NULL value.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19594 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoApply -ass-force-style also to tracks generated from subdata.
eugeni [Tue, 29 Aug 2006 10:35:58 +0000 (10:35 +0000)]
Apply -ass-force-style also to tracks generated from subdata.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19590 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoIgnore '*' at the beginning of style name.
eugeni [Mon, 28 Aug 2006 16:59:29 +0000 (16:59 +0000)]
Ignore '*' at the beginning of style name.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19573 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix font scaling taking margins into account.
eugeni [Mon, 28 Aug 2006 16:43:17 +0000 (16:43 +0000)]
Fix font scaling taking margins into account.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19572 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd -(no)ass-use-margins option.
eugeni [Mon, 28 Aug 2006 15:12:45 +0000 (15:12 +0000)]
Add -(no)ass-use-margins option.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19569 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: fix indentation after r19562.
eugeni [Sun, 27 Aug 2006 22:15:46 +0000 (22:15 +0000)]
Cosmetics: fix indentation after r19562.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19563 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoTransition effects support.
eugeni [Sun, 27 Aug 2006 22:12:31 +0000 (22:12 +0000)]
Transition effects support.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19562 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSimplify ass_glyph_cache_reset().
eugeni [Sat, 26 Aug 2006 20:09:54 +0000 (20:09 +0000)]
Simplify ass_glyph_cache_reset().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19551 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReset glyph cache on reconfigure.
eugeni [Sat, 26 Aug 2006 19:00:21 +0000 (19:00 +0000)]
Reset glyph cache on reconfigure.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19545 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd right and left margins support to libass.
eugeni [Sat, 26 Aug 2006 18:24:37 +0000 (18:24 +0000)]
Add right and left margins support to libass.
Add ability to not use margins even when they are available.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19544 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix previous commit.
eugeni [Thu, 24 Aug 2006 15:38:28 +0000 (15:38 +0000)]
Fix previous commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19524 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSimplify vf_ass initialization.
eugeni [Thu, 24 Aug 2006 15:36:20 +0000 (15:36 +0000)]
Simplify vf_ass initialization.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19523 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoNew cmdline option: -ass-force-style.
eugeni [Tue, 22 Aug 2006 23:20:05 +0000 (23:20 +0000)]
New cmdline option: -ass-force-style.
Allows overriding any style parameter from command line.
Idea and original patch by Konstantin G. Khlebnikov { koct9i aT gmail doT com }.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19501 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSSA/ASS parser reworked, with 2 main results:
eugeni [Tue, 22 Aug 2006 22:11:01 +0000 (22:11 +0000)]
SSA/ASS parser reworked, with 2 main results:
support for script embedded fonts (fonts, uuencoded directly into script) added;
matroska interface functions have got more sensible names.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19498 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agouse of malloc without prototype.. very bad on 64bit archs
rfelker [Mon, 21 Aug 2006 22:02:49 +0000 (22:02 +0000)]
use of malloc without prototype.. very bad on 64bit archs

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19490 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agono c++ decls!
rfelker [Mon, 21 Aug 2006 21:46:59 +0000 (21:46 +0000)]
no c++ decls!

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19487 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd public functions for removal of styles and events.
eugeni [Mon, 21 Aug 2006 16:33:13 +0000 (16:33 +0000)]
Add public functions for removal of styles and events.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19480 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMove all internal -I parameters to the front of CFLAGS to avoid using external
diego [Thu, 17 Aug 2006 17:19:56 +0000 (17:19 +0000)]
Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix wrong handling of transparency in \fad(\fade).
eugeni [Wed, 16 Aug 2006 00:54:59 +0000 (00:54 +0000)]
Fix wrong handling of transparency in \fad(\fade).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19412 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReplace stdint.h with inttypes.h.
eugeni [Tue, 15 Aug 2006 22:46:56 +0000 (22:46 +0000)]
Replace stdint.h with inttypes.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19411 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAngle value from style was ignored. Not anymore.
eugeni [Tue, 15 Aug 2006 20:41:53 +0000 (20:41 +0000)]
Angle value from style was ignored. Not anymore.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19410 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAdd subdata to ass_track conversion for external subtitles.
eugeni [Tue, 15 Aug 2006 19:25:46 +0000 (19:25 +0000)]
Add subdata to ass_track conversion for external subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19407 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics: fix indentation after the last patch.
eugeni [Tue, 15 Aug 2006 14:43:04 +0000 (14:43 +0000)]
Cosmetics: fix indentation after the last patch.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19405 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoAllow \fade to be used in place of \fad and vice versa.
eugeni [Tue, 15 Aug 2006 14:40:57 +0000 (14:40 +0000)]
Allow \fade to be used in place of \fad and vice versa.
Now they are distinguished by the number of arguments.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19404 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoReplace %lld with PRId64, part 2.
eugeni [Sun, 13 Aug 2006 10:54:29 +0000 (10:54 +0000)]
Replace %lld with PRId64, part 2.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19384 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoMinGW treats %lld as %d. Replace it with PRId64.
eugeni [Sun, 13 Aug 2006 00:47:33 +0000 (00:47 +0000)]
MinGW treats %lld as %d. Replace it with PRId64.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19380 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoFix compilation with gcc 2.95.
eugeni [Sat, 12 Aug 2006 18:33:19 +0000 (18:33 +0000)]
Fix compilation with gcc 2.95.
Patch by Jason Tackaberry, tack at urandom dot ca.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19376 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoUse FontConfig cache to speedup mplayer startup.
eugeni [Sun, 6 Aug 2006 17:56:01 +0000 (17:56 +0000)]
Use FontConfig cache to speedup mplayer startup.
Patch by Zealot <zealot0630 at gmail dot com>.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19346 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoUnify include paths in the build system, part I.
diego [Thu, 27 Jul 2006 10:08:17 +0000 (10:08 +0000)]
Unify include paths in the build system, part I.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19195 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agomarks several read-only string parameters which aren't modified inside the called...
reynaldo [Sat, 15 Jul 2006 16:03:12 +0000 (16:03 +0000)]
marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19109 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agomarks several function without a prototype which arent used outside its sourcefile...
reynaldo [Thu, 13 Jul 2006 20:59:18 +0000 (20:59 +0000)]
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19071 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoCosmetics.
eugeni [Thu, 13 Jul 2006 18:52:16 +0000 (18:52 +0000)]
Cosmetics.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19069 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoUse FcPatternAdd-Type instead of FcNameParse. The latter, as it turns out, requires...
eugeni [Thu, 13 Jul 2006 18:49:06 +0000 (18:49 +0000)]
Use FcPatternAdd-Type instead of FcNameParse. The latter, as it turns out, requires escaping of some characters ('-', maybe more).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19068 b3059339-0415-0410-9bf9-f77b7e298cf2

18 years agoSupport 6 argument variant of \move.
eugeni [Wed, 12 Jul 2006 22:28:20 +0000 (22:28 +0000)]
Support 6 argument variant of \move.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19049 b3059339-0415-0410-9bf9-f77b7e298cf2