diff options
| author | wm4 <wm4@nowhere> | 2013-06-04 00:29:29 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-04 00:29:44 +0200 |
| commit | 92ae48db0f91fbfcfbb1722fa81c922808f62d5a (patch) | |
| tree | e32fe21b5f8c11ada7788768a76e2d9f7d061c66 /core/options.h | |
| parent | daf8ed831b4ae63cf0931cc3d6727956137f865f (diff) | |
| parent | c1ac97b99b3e80bbf84ed540178dd6689ead0b87 (diff) | |
| download | mpv-92ae48db0f91fbfcfbb1722fa81c922808f62d5a.tar.bz2 mpv-92ae48db0f91fbfcfbb1722fa81c922808f62d5a.tar.xz | |
Merge branch 'sub_mess'
This branch heavily refactors the subtitle code (both loading and
rendering), and adds support for a few new formats through FFmpeg.
We don't remove any of the old code yet. There are still some subtleties
related to subreader.c to be resolved: code page detection & conversion,
timing post-processing, UTF-16 subtitle support, support for the -subfps
option. Also, SRT reading and loading ASS via libass should be turned
into proper demuxers. (SRT is needed because Libav's is gravely broken,
and we want ASS loading via libass to cover full libass format support.
Both should be demuxers which are probed _before_ libavformat, so that
all subtitles can be loaded through the demuxer infrastructure, and
libavformat subtitles don't need to be treated in a special way.)
Diffstat (limited to 'core/options.h')
| -rw-r--r-- | core/options.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/options.h b/core/options.h index a2e91d417b..0504ea0591 100644 --- a/core/options.h +++ b/core/options.h @@ -83,7 +83,6 @@ typedef struct MPOpts { int osd_level; int osd_duration; int osd_fractions; - char *vobsub_name; int untimed; char *stream_capture; char *stream_dump; @@ -140,9 +139,17 @@ typedef struct MPOpts { char **sub_lang; int audio_display; int sub_visibility; + int sub_pos; + float sub_delay; + float sub_fps; int forced_subs_only; char *quvi_format; + // subreader.c + int suboverlap_enabled; + char *sub_cp; + int sub_no_text_pp; + char *audio_stream; int audio_stream_cache; char *sub_stream; @@ -170,6 +177,7 @@ typedef struct MPOpts { char **sub_name; char **sub_paths; int sub_auto; + int sub_match_fuzziness; int osd_bar_visible; float osd_bar_align_x; float osd_bar_align_y; |