diff options
| author | wm4 <wm4@nowhere> | 2013-06-22 02:09:52 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-25 00:11:56 +0200 |
| commit | cfa45c40dc0cfe44b699029168b62d4d3e16c288 (patch) | |
| tree | 5a80d3b6e82711a5816c509e803c029b93342892 /core/mp_core.h | |
| parent | 1bfae45a88ac7c24b74a6f7ca6eb4aa27d20c653 (diff) | |
| download | mpv-cfa45c40dc0cfe44b699029168b62d4d3e16c288.tar.bz2 mpv-cfa45c40dc0cfe44b699029168b62d4d3e16c288.tar.xz | |
sub: add demux_libass wrapper, drop old hacks
demux_libass.c allows us to make subtitle format detection part of the
normal file loading process. libass has no probe function, but trying to
load the start of a file (the first 4 KB) is good enough. Hope that
libass can even handle random binary input gracefully without printing
stupid log messages, and that the libass parser doesn't accept too many
non-ASS files as input.
This doesn't handle the -subcp option correctly yet. This will be fixed
later.
Diffstat (limited to 'core/mp_core.h')
| -rw-r--r-- | core/mp_core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/mp_core.h b/core/mp_core.h index a327e43822..c958132700 100644 --- a/core/mp_core.h +++ b/core/mp_core.h @@ -290,8 +290,7 @@ extern int forced_subs_only; void uninit_player(struct MPContext *mpctx, unsigned int mask); void reinit_audio_chain(struct MPContext *mpctx); double playing_audio_pts(struct MPContext *mpctx); -struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename, - float fps, int noerr); +struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename, int noerr); int reinit_video_chain(struct MPContext *mpctx); int reinit_video_filters(struct MPContext *mpctx); void pause_player(struct MPContext *mpctx); |