diff options
| author | wm4 <wm4@nowhere> | 2012-12-08 13:59:49 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-12-11 00:37:54 +0100 |
| commit | 5bf8706d1f6536cd89207b777161ab83195ddb20 (patch) | |
| tree | 1e4ba07a00da6dcde3f8f308f2aa1128af56619e /core/mp_core.h | |
| parent | b3fb7c2cade9d70a4ca05821c87f68e941da6237 (diff) | |
| download | mpv-5bf8706d1f6536cd89207b777161ab83195ddb20.tar.bz2 mpv-5bf8706d1f6536cd89207b777161ab83195ddb20.tar.xz | |
sub: remove vobsub reader in favor of ffmpeg vobsub demuxer
ffmpeg recently added a demuxer that can read vobsubs (pairs of .sub and
.idx files). Get rid of the internal vobsub reader, and use the ffmpeg
demuxer instead.
Sneak in an unrelated manpage change (autosub default).
Diffstat (limited to 'core/mp_core.h')
| -rw-r--r-- | core/mp_core.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/core/mp_core.h b/core/mp_core.h index f633f3481f..92803d2dd0 100644 --- a/core/mp_core.h +++ b/core/mp_core.h @@ -35,7 +35,6 @@ #define INITIALIZED_GETCH2 8 #define INITIALIZED_SPUDEC 32 #define INITIALIZED_STREAM 64 -#define INITIALIZED_VOBSUB 256 #define INITIALIZED_DEMUXER 512 #define INITIALIZED_ACODEC 1024 #define INITIALIZED_VCODEC 2048 @@ -43,12 +42,6 @@ #define INITIALIZED_ALL 0xFFFF -#define SUB_SOURCE_SUBS 0 -#define SUB_SOURCE_VOBSUB 1 -#define SUB_SOURCE_DEMUX 2 -#define SUB_SOURCES 3 - - enum stop_play_reason { KEEP_PLAYING = 0, // must be 0, numeric values of others do not matter AT_END_OF_FILE, // file has ended normally, prepare to play next @@ -120,9 +113,6 @@ struct track { // External text subtitle using non-libass subtitle renderer. struct sub_data *subdata; - - // External image subtitle (data is in vo_vobsub). 0 if not set. - int vobsub_id_plus_one; }; typedef struct MPContext { |