diff options
author | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
commit | 403a266d466850621397c07e0b96cc2c493b2936 (patch) | |
tree | 0835a0908b3df8cca8374d173c34e0bf7df7d842 /demux/stheader.h | |
parent | 536871d7e5848eb385b97202a33b9382b5e8ab0e (diff) | |
parent | 54851d60614e912fc422658302d72811a31b80f8 (diff) | |
download | mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2 mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz |
Merge branch 'sub_mess2'
...the return.
Diffstat (limited to 'demux/stheader.h')
-rw-r--r-- | demux/stheader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index 421dfaf857..58caa27dcd 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -163,8 +163,9 @@ typedef struct sh_sub { SH_COMMON unsigned char *extradata; // extra header data passed from demuxer int extradata_len; + int frame_based; // timestamps are frame-based + bool is_utf8; // if false, subtitle packet charset is unknown struct ass_track *track; // loaded by libass - struct sub_data *sub_data; // loaded by subreader.c struct dec_sub *dec_sub; // decoder context } sh_sub_t; |