summaryrefslogtreecommitdiffstats
path: root/libass
Commit message (Collapse)AuthorAgeFilesLines
* Rename get_path.[ch] --> path.[ch].diego2010-03-201-1/+1
| | | | | | | 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
* Add const to ass_read_stream fname argument, the string is not modified.reimar2010-02-252-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30740 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for loading ASS subtitles through the stream layer and thus e.g.reimar2010-02-052-0/+48
| | | | | | | | from some network location. Patch by Yuriy Kaminskiy [yumkam mail ru] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30515 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update internal libass copy to commit 8db4a5greg2010-01-0823-4782/+7764
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix libass API checksgreg2010-01-082-2/+2
| | | | | | libass API changed in 0.9.7, not 0.9.8. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30239 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation if FreeType is not available, in particular do not try to buildreimar2010-01-011-1/+1
| | | | | | libass and use the internal ass.h as a stub for structs needed for EOSD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert renaming of process_force_style to restore compilation againstreimar2009-12-244-6/+7
| | | | | | | Ubuntu's libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30108 b3059339-0415-0410-9bf9-f77b7e298cf2
* Some ugly hacks to make compiling against a newer external version of libass ↵reimar2009-12-242-3/+13
| | | | | | work. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
* rename process_force_style to ass_process_force_style to match the APIreimar2009-12-243-6/+6
| | | | | | | as newer libass versions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30106 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation with internal ASS when no ass header is installed system-wide.reimar2009-12-191-1/+1
| | | | | | | Patch by Erik Auerswald [auerswal unix-ag.uni-kl.de] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30073 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make ass_mp.h use the system-libass headers when the internal one is disabled.reimar2009-12-191-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30068 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash when event format is not specifiedgreg2009-08-131-2/+9
| | | | | | Patch by Andrew Savchenko <bircoph@gmail.com>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29514 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix stupid, off-by-one, mistakes in assert() expressions.eugeni2009-07-271-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29448 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure clip coordinates are inside the screen area.eugeni2009-07-181-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: make some variables constant to signify their intended use and,eugeni2009-07-181-6/+5
| | | | | | | therefore, improve code readability. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29424 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix read after the end of allocated buffer.eugeni2009-07-182-6/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29423 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a missing check for a NULL return value.eugeni2009-06-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29367 b3059339-0415-0410-9bf9-f77b7e298cf2
* whitespace cosmetics: Remove all trailing whitespace.diego2009-05-1312-144/+144
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't automatically wrap lines when WrapStyle==2.eugeni2009-04-211-1/+1
| | | | | | \n and \N still work. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29219 b3059339-0415-0410-9bf9-f77b7e298cf2
* Document the ass_render_event event_images parameter.reimar2009-03-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29087 b3059339-0415-0410-9bf9-f77b7e298cf2
* Initialize all structs to 0 before using them.reimar2009-03-281-0/+3
| | | | | | | | | | This is consistent with the remaining code (which uses e.g. calloc) and makes it easier to extend the structs in the future. As a side effect it fixes several valgrind errors in hashmap_hash/hashmap_key_compare caused by padding in the structures, but it is not a correct fix for that issue. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29086 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: reindent.eugeni2009-03-161-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28977 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix uninitialized memory access in ass_fontconfig.eugeni2009-03-161-0/+2
| | | | | | | This fixes hangups with plaintext subtitles happening when the first subtitle is about to be displayed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28976 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use ScaledBorderAndShadow: yes by default.greg2009-03-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28935 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: reindent.eugeni2009-03-081-25/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28896 b3059339-0415-0410-9bf9-f77b7e298cf2
* Treat -font/-subfont as Fontconfig pattern in libass.eugeni2009-03-088-13/+31
| | | | | | Patch by Adrian Stutz (adrian sttz ch). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28895 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove extraneous braces.greg2009-03-081-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28892 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't assume width == stride for bitmap composition.greg2009-03-081-6/+8
| | | | | | Fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1421 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28891 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix clipping for pan-and-scan.greg2009-03-081-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28876 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a proper color check to the overlap compositing.greg2009-03-081-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28875 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace rotation functions with a simplified version adapted fromgreg2009-03-081-79/+40
| | | | | | | | vsfilter. This (mostly) fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1394#c7 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28874 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only use first \org in a line.greg2009-03-071-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28873 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix \be blur start position.greg2009-03-061-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28837 b3059339-0415-0410-9bf9-f77b7e298cf2
* Raise max. number of \be applications to 100, introduce #define for it.greg2009-03-061-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28836 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace magic numbers (for subpixel accuracy masking) with a define.greg2009-03-061-4/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28835 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use blur with kernel [[1,2,1], [2,4,2], [1,2,1]] for \be.greg2009-03-063-14/+34
| | | | | | This is faster than gaussian blur and similar to vsfilter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28834 b3059339-0415-0410-9bf9-f77b7e298cf2
* Combine adjacent overlapping, translucent glyph borders and shadows togreg2009-03-053-1/+177
| | | | | | | | avoid luminance build-up, which looks ugly. The resulting, modified bitmaps are stored in separate bitmap cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28824 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix positioned events' y-position when pan-and-scan is used.greg2009-03-051-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28823 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for subpixel accuracy of 3 bits for \pos and \move.greg2009-03-051-15/+20
| | | | | | | Also, restrict advance subpixel accuracy to 3 bits to reduce cache bloat. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28822 b3059339-0415-0410-9bf9-f77b7e298cf2
* Style override for ScaledBorderAndShadow.greg2009-03-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28821 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support ScaledBorderAndShadow property.greg2009-03-055-1/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28820 b3059339-0415-0410-9bf9-f77b7e298cf2
* Scale shadow displacement and blur size like border size.greg2009-03-051-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28819 b3059339-0415-0410-9bf9-f77b7e298cf2
* Round shadow displacement to nearest int.greg2009-03-051-4/+5
| | | | | | Use double for shadow displacement parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28818 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support a vsfilter special case:greg2009-03-051-1/+7
| | | | | | | If PlayResX or Y is 1280/1024 respectively and the other PlayRes attribute isn't provided, use 1280/1024 for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28817 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack: half-merge glyph border with outline to avoid ugly anti-aliasinggreg2009-03-051-1/+1
| | | | | | in certain situations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28816 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore PlayResX/Y aspect ratio for font aspect ratio.greg2009-03-051-4/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28814 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a memory leak.eugeni2009-03-011-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28787 b3059339-0415-0410-9bf9-f77b7e298cf2
* With pan-and-scan, keep positioned events in their original positionseugeni2009-03-011-1/+5
| | | | | | | | relative to video. Patch by Grigori Goronzy (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28783 b3059339-0415-0410-9bf9-f77b7e298cf2
* Zero-fill glyph_info_t before use.eugeni2009-02-271-1/+1
| | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28754 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function argument.eugeni2009-02-273-44/+44
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28753 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support fractional arguments for some override tags.eugeni2009-02-273-22/+40
| | | | | | | Done by parsing all integers as doubles first and then converting them to the nearest integer. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28752 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix two gcc warnings.eugeni2009-02-271-2/+2
| | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28751 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memory leak produced by the \blur patch.eugeni2009-02-271-2/+2
| | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28750 b3059339-0415-0410-9bf9-f77b7e298cf2
* Stronger blur.eugeni2009-02-271-0/+1
| | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28749 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow shadow without border.eugeni2009-02-271-6/+3
| | | | | | Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28748 b3059339-0415-0410-9bf9-f77b7e298cf2
* In case of several \move or \pos in one line, prefer the first one.eugeni2009-02-071-8/+12
| | | | | | Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28473 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add stubs for a few unimplemented tags.eugeni2009-02-071-1/+39
| | | | | | Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28472 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow \be with arguments other than 0 or 1. Implement \blur.eugeni2009-02-074-20/+63
| | | | | | Patch by Grigori G, greg at chown ath cx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28471 b3059339-0415-0410-9bf9-f77b7e298cf2
* increase max glyph and lines limitcompn2009-01-291-2/+2
| | | | | | | | patch by Scaevolus on irc fixes http://samples.mplayerhq.hu/Matroska/subtitles/090128_gszs02.mkv git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28386 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of pointless 'extern' keywords.diego2008-12-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistently use NULL for pointers instead of 0.reimar2008-11-021-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27876 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fallback to non-fontconfig behaviour when fontconfig initialization fails.reimar2008-11-021-5/+3
| | | | | | | Also fixes a memleak in that case, bug #1313. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27875 b3059339-0415-0410-9bf9-f77b7e298cf2
* libass: fix type mismatch between size parameter and the way it's usedaurel2008-09-052-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27531 b3059339-0415-0410-9bf9-f77b7e298cf2
* libass: add a new ass_process_data() to process demuxed subtitle packetsaurel2008-09-052-4/+24
| | | | | | | conforming to the ASS spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't print drawing commands on screen.eugeni2008-08-081-1/+12
| | | | | | | Drawing mode is not implemented in libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27442 b3059339-0415-0410-9bf9-f77b7e298cf2
* If (has outline) blur(outline) else blur(glyph).eugeni2008-08-071-1/+2
| | | | | | | | | | | 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
* \org turns off collision detection.eugeni2008-08-071-0/+1
| | | | | | | Patch by Diogo Franco (diogomfranco gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27440 b3059339-0415-0410-9bf9-f77b7e298cf2
* Treat \h as space character.eugeni2008-08-071-1/+1
| | | | | | | Patch by Robert Rudd (robrudd at users sourceforge net). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27439 b3059339-0415-0410-9bf9-f77b7e298cf2
* Calculate subtitle origin in floating point.eugeni2008-08-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27438 b3059339-0415-0410-9bf9-f77b7e298cf2
* Calculate subtitle position in floating point.eugeni2008-08-071-7/+7
| | | | | | | | 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
* Rename font-related preprocessor directives.diego2008-08-075-15/+15
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;diego2008-08-012-6/+6
| | | | | | | 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
* Start unifying names of internal preprocessor directives.diego2008-07-302-6/+6
| | | | | | | | 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
* Fix \fn without an argument consuming the next '\'.eugeni2008-07-091-6/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27242 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check if the font set returned from FcFontSort in not NULL.eugeni2008-06-231-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27128 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reindent.eugeni2008-06-231-35/+36
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27127 b3059339-0415-0410-9bf9-f77b7e298cf2
*