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
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
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
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
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
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
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
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
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
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
3a1a54fab4
Case insensitive parsing of SSA/ASS section headers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26303 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-30 17:42:19 +00:00
994b2022c3
Skip BOM at the beginning of text in ASS parser.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26302 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-30 17:42:17 +00:00
518f4e003c
Allow overriding [Script Info] parameters with -ass-force-style option.
...
Patch by Anton Khirnov, wyskas gmail com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25610 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 15:38:46 +00:00
82ee453947
typo
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25543 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 03:17:04 +00:00
b43c16f8b6
Our enca code uses strdup() on the input encoding name, as we don't modify it we can use the original constant string.
...
Uses less memory, code is simpler and faster.
Fixes memory leak (noticed by ulion).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24879 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-28 14:26:05 +00:00
387ccdc034
When parsing ass-force-style arguments, search for '=' and '.' characters with
...
strrchr. This allows using it for styles whose name contains those characters.
Patch by Бранко Мајић <branko majic at gmail com>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23560 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-15 22:22:16 +00:00
34402c3cf2
Make sure there is at least one style in ass_track when parsing events.
...
Before it was only checked for embedded subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23559 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-15 22:15:27 +00:00
4939caa691
Move code for reading a file and recoding it to utf-8 to a separate function.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23442 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-01 19:56:44 +00:00
8513877fac
Support fractional font sizes.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23318 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-14 20:41:14 +00:00
929e461eb0
Don't deallocate font data if it will be used later.
...
It produced either segfault or "Error opening memory font" with any script
that contains embedded fonts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23282 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-09 21:38:28 +00:00
999e603eb7
Both (-1) and 1 mean bold font in SSA/ASS styles.
...
The same for italics and some other fields.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22281 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-19 20:10:55 +00:00
39c818a551
Correct implementation of text spacing.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22277 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-19 18:01:49 +00:00
7db61d9736
Keep embedded fonts in ass_library_t and perform actual disk write
...
in fontconfig initialization. This is required for some fontconfig-related
improvements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21474 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 17:59:13 +00:00
b5a682f0aa
Rename: ass_process_font -> ass_add_font.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 17:35:40 +00:00
985d92c189
Avoid calling validate_fname() twice for one string.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21469 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 16:10:23 +00:00
598d5be3ad
MSGTRs for libass
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21082 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 22:35:17 +00:00
8856d67d40
Collect all includes of mplayer headers in libass in a single file (mputils.h).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21042 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 00:41:00 +00:00
f78a3783e5
Fix the following compiler warnings:
...
ass.c:999: warning: unused variable 'i'
ass.c:1041: warning: pointer targets in assignment differ in signedness
ass.c:1043: warning: pointer targets in assignment differ in signedness
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20714 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 17:26:55 +00:00
6fef7a200f
Introduce MSGT_ASS, use it for all libass messages.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 18:15:33 +00:00
593e642133
Implement loading subtitles from memory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20619 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 02:15:08 +00:00
452d1d6c61
Bugfix: sub_recode could deallocate global sub_cp under some circumstances.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20618 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 01:41:48 +00:00
ef5dee5d56
Revert r20517.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20519 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 17:29:55 +00:00
06758d89bc
Copy the following functions to libass to avoid dependency on the rest of mplayer:
...
guess_buffer_cp
utf8_get_char
blur
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20517 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 15:03:30 +00:00
efea99c2c9
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
2006-10-28 15:07:18 +00:00
50ca7a4f72
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
2006-10-01 17:09:04 +00:00
6cc5d2fc08
Set ReadOrder values for external subtitles.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 18:22:44 +00:00
9d3ed04d47
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
2006-09-03 17:42:31 +00:00
b1515e31b1
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
2006-09-02 19:21:40 +00:00
fc6751b73a
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
2006-09-02 19:17:32 +00:00
19e596920d
Read layer info from external subs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19641 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 18:10:04 +00:00
534fe740f5
Bugfix: potential write of unallocated memory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19618 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-31 22:45:20 +00:00
1d9317f8d5
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
2006-08-29 10:35:58 +00:00
0decebcb05
Ignore '*' at the beginning of style name.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19573 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 16:59:29 +00:00
ae7f2be0ab
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
2006-08-22 23:20:05 +00:00
5762122f37
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
2006-08-22 22:11:01 +00:00
cd59e21610
Add public functions for removal of styles and events.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19480 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 16:33:13 +00:00
eaffefaaf0
Replace stdint.h with inttypes.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19411 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 22:46:56 +00:00
070c050f0a
Replace %lld with PRId64, part 2.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19384 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-13 10:54:29 +00:00
20b008a791
MinGW treats %lld as %d. Replace it with PRId64.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19380 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-13 00:47:33 +00:00
e15ae9a600
Initial libass release (without mencoder support).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00
diego
eugeni
iive
kraymer