wm4 31f685040b Merge branch 'master' into remove_old_demuxers ...

Conflicts:
	DOCS/man/en/changes.rst
	DOCS/man/en/options.rst

2013-07-08 21:55:44 +02:00

..

ass_mp.c

sub: add demux_libass wrapper, drop old hacks

2013-06-25 00:11:56 +02:00

ass_mp.h

sub: add demux_libass wrapper, drop old hacks

2013-06-25 00:11:56 +02:00

dec_sub.c

Remove old demuxers

2013-07-07 23:54:11 +02:00

dec_sub.h

dec_sub: introduce sub_control(), use it for sub_step

2013-06-29 22:58:14 +02:00

draw_bmp.c

sub: don't crash on GBRP video

2013-03-28 21:46:17 +01:00

draw_bmp.h

vo_xv, vo_x11: simplify OSD redrawing

2013-01-13 20:04:12 +01:00

find_subfiles.c

sub: remove some global variables

2013-05-30 22:44:18 +02:00

find_subfiles.h

sub: remove vobsub reader in favor of ffmpeg vobsub demuxer

2012-12-11 00:37:54 +01:00

img_convert.c

img_convert: use multiple bounding boxes for ASS->RGBA

2013-01-13 20:04:16 +01:00

img_convert.h

img_convert: add sub_bitmap bounding box functions

2013-01-13 20:04:16 +01:00

osd_dummy.c

sub: allow rendering OSD in ASS image format directly, simplify

2012-10-16 07:26:30 +02:00

osd_font.otf

osd: convert OSD font to OpenType

2013-04-27 18:03:19 +02:00

osd_libass.c

ass_mp: provide function to add default styles

2013-06-03 22:40:07 +02:00

sd_ass.c

sd_ass: convert pts to integer for get_text()

2013-06-29 22:58:14 +02:00

sd_lavc_conv.c

sd_ass: handle libavformat ASS comment packets as well

2013-06-23 22:34:00 +02:00

sd_lavc.c

sd_lavc: respect forced subs only setting for DVD subs

2013-06-29 22:58:14 +02:00

sd_lavf_srt.c

sub: add hack for Libav SRT demuxer

2013-06-25 00:11:57 +02:00

sd_microdvd.c

sd_srt, sd_microdvd: set ASS script resolution

2013-06-03 23:00:39 +02:00

sd_movtext.c

sd_ass: disable special handling of subtitles with duration 0

2013-06-25 00:11:54 +02:00

sd_spu.c

sub: add name field to all sub decoders

2013-06-03 22:40:32 +02:00

sd_srt.c

sd_srt: handle '<font color="##FFA500">'

2013-06-18 02:19:15 +02:00

sd.h

dec_sub: introduce sub_control(), use it for sub_step

2013-06-29 22:58:14 +02:00

spudec.c

spudec: restore --sub-forced-only support

2013-05-30 22:40:32 +02:00

spudec.h

sub: add sd_spu.c to wrap spudec, cleanup mplayer.c

2013-05-30 22:40:32 +02:00

sub.c

sub: Do not use deprecated “Sans” fontconfig alias

2013-07-08 18:02:46 +02:00

sub.h

sub: update subtitle time offset even if paused

2013-06-29 22:58:14 +02:00