diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-26 20:42:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-26 20:42:15 +0200 |
| commit | f50f34245efa1012855a693558680bcfb7c348e5 (patch) | |
| tree | 76e8fc186a96fdc1106b5c634d5937e514a06037 /libvo/vo_caca.c | |
| parent | ec55a188e4d0232acd50fcabc0a3db3be2b9538e (diff) | |
| parent | c9026cb3210205b07e2e068467a18ee40f9259a3 (diff) | |
| download | mpv-f50f34245efa1012855a693558680bcfb7c348e5.tar.bz2 mpv-f50f34245efa1012855a693558680bcfb7c348e5.tar.xz | |
Merge branch 'sub'
* sub:
sub/OSD: move some related files to sub/
subtitles: options: enable -ass by default
subtitles: change default libass rendering style
demux_mkv, chapters: change millisecond arithmetic to ns
cleanup: rename ass_* functions to mp_ass_*
subs: use correct font aspect ratio for libass + converted subs
cleanup: some random minor code simplification and cleanup
vf_vo: fix EOSD change detection bug
sd_ass: remove subreader use, support plaintext markup
subtitles: style support for common SubRip tags and MicroDVD
core: ordered chapters: fix bad subtitle parameter
subs/demux: don't try to enable sub track when creating it
subtitles/demux: store duration instead of endpts in demux packets
subtitles: add framework for subtitle decoders
options: add special -leak-report option
subtitles: remove code trying to handle text subs with libavcodec
cleanup: move MP_NOPTS_VALUE definition to mpcommon.h
subtitles: move global ass_track to struct osd_state
core: move most mpcommon.c contents to mplayer.c
core: move global "subdata" and "vo_sub_last" to mpctx
subtitles: remove sub_last_pts hack
options: move -noconfig to option struct, simplify
Diffstat (limited to 'libvo/vo_caca.c')
| -rw-r--r-- | libvo/vo_caca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c index 75e862ef91..2a5ebad4e7 100644 --- a/libvo/vo_caca.c +++ b/libvo/vo_caca.c @@ -35,7 +35,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" -#include "sub.h" +#include "sub/sub.h" #include "osdep/keycodes.h" #include "mp_msg.h" |