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 /libmenu | |
| 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 'libmenu')
| -rw-r--r-- | libmenu/menu.c | 4 | ||||
| -rw-r--r-- | libmenu/menu_cmdlist.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_console.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_list.c | 2 | ||||
| -rw-r--r-- | libmenu/menu_txt.c | 2 | ||||
| -rw-r--r-- | libmenu/vf_menu.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libmenu/menu.c b/libmenu/menu.c index 8a9cb28872..f537cd1671 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -26,8 +26,8 @@ #include <unistd.h> #include "libvo/osd.h" -#include "libvo/font_load.h" -#include "libvo/sub.h" +#include "sub/font_load.h" +#include "sub/sub.h" #include "osdep/keycodes.h" #include "asxparser.h" #include "stream/stream.h" diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c index 5b7812be5e..14026d04c4 100644 --- a/libmenu/menu_cmdlist.c +++ b/libmenu/menu_cmdlist.c @@ -33,7 +33,7 @@ #include "menu.h" #include "menu_list.h" -#include "libvo/font_load.h" +#include "sub/font_load.h" #include "input/input.h" diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c index dd706b65cb..eb8595e9ab 100644 --- a/libmenu/menu_console.c +++ b/libmenu/menu_console.c @@ -38,7 +38,7 @@ #include "m_option.h" #include "menu.h" -#include "libvo/font_load.h" +#include "sub/font_load.h" #include "osdep/keycodes.h" #include "input/input.h" #include "osdep/timer.h" diff --git a/libmenu/menu_list.c b/libmenu/menu_list.c index 28264ce04c..37f10d123e 100644 --- a/libmenu/menu_list.c +++ b/libmenu/menu_list.c @@ -29,7 +29,7 @@ #include "m_struct.h" #include "menu.h" -#include "libvo/font_load.h" +#include "sub/font_load.h" #include "osdep/keycodes.h" #define IMPL 1 diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c index 308d9547c0..0170320884 100644 --- a/libmenu/menu_txt.c +++ b/libmenu/menu_txt.c @@ -30,7 +30,7 @@ #include "m_option.h" #include "menu.h" -#include "libvo/font_load.h" +#include "sub/font_load.h" #include "osdep/keycodes.h" struct menu_priv_s { diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 1a5d003e94..994c7134ea 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -32,8 +32,8 @@ #include "libvo/fastmemcpy.h" #include "libvo/video_out.h" -#include "libvo/font_load.h" -#include "libvo/sub.h" +#include "sub/font_load.h" +#include "sub/sub.h" #include "input/input.h" #include "m_struct.h" #include "menu.h" |