diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-28 04:12:18 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-28 04:12:18 +0200 |
| commit | 479f5e742f22d46430fa265adfa9162f4e2ab865 (patch) | |
| tree | 8450cfd34feb5b81d604101ad9ebfc7b24c1d88e /libmpdemux/stheader.h | |
| parent | 0d7f9f033cdd677df3b85aca45491955b87a1abc (diff) | |
| parent | 97293969b40797442ec0f612b89a89ace8804561 (diff) | |
| download | mpv-479f5e742f22d46430fa265adfa9162f4e2ab865.tar.bz2 mpv-479f5e742f22d46430fa265adfa9162f4e2ab865.tar.xz | |
Merge svn changes up to r27841
Conflicts:
mplayer.c
Diffstat (limited to 'libmpdemux/stheader.h')
| -rw-r--r-- | libmpdemux/stheader.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 203556bdda..67fa0e1fb4 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -102,12 +102,6 @@ typedef struct sh_sub { struct MPOpts *opts; int sid; char type; // t = text, v = VobSub, a = SSA/ASS - int has_palette; // If we have a valid palette - unsigned int palette[16]; // for VobSubs - int width, height; // for VobSubs - int custom_colors; - unsigned int colors[4]; - int forced_subs_only; unsigned char* extradata; // extra header data passed from demuxer int extradata_len; struct ass_track_s *ass_track; // for SSA/ASS streams (type == 'a') |