mirror of https://github.com/mpv-player/mpv
Change libass type names to match upstream renames
This commit is contained in:
parent
29bc25b6d4
commit
c73217c07a
|
@ -123,7 +123,7 @@ typedef struct sh_sub {
|
||||||
char type; // t = text, v = VobSub, a = SSA/ASS
|
char type; // t = text, v = VobSub, a = SSA/ASS
|
||||||
unsigned char* extradata; // extra header data passed from demuxer
|
unsigned char* extradata; // extra header data passed from demuxer
|
||||||
int extradata_len;
|
int extradata_len;
|
||||||
struct ass_track_s *ass_track; // for SSA/ASS streams (type == 'a')
|
struct ass_track *ass_track; // for SSA/ASS streams (type == 'a')
|
||||||
char* lang; // track language
|
char* lang; // track language
|
||||||
int default_track;
|
int default_track;
|
||||||
} sh_sub_t;
|
} sh_sub_t;
|
||||||
|
|
|
@ -152,7 +152,7 @@ typedef struct MPContext {
|
||||||
int global_sub_indices[SUB_SOURCES];
|
int global_sub_indices[SUB_SOURCES];
|
||||||
// set_of_ass_tracks[i] contains subtitles from set_of_subtitles[i]
|
// set_of_ass_tracks[i] contains subtitles from set_of_subtitles[i]
|
||||||
// parsed by libass or NULL if format unsupported
|
// parsed by libass or NULL if format unsupported
|
||||||
struct ass_track_s *set_of_ass_tracks[MAX_SUBTITLE_FILES];
|
struct ass_track *set_of_ass_tracks[MAX_SUBTITLE_FILES];
|
||||||
sub_data* set_of_subtitles[MAX_SUBTITLE_FILES];
|
sub_data* set_of_subtitles[MAX_SUBTITLE_FILES];
|
||||||
|
|
||||||
int file_format;
|
int file_format;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "libmpdemux/stheader.h"
|
#include "libmpdemux/stheader.h"
|
||||||
|
|
||||||
extern double sub_last_pts;
|
extern double sub_last_pts;
|
||||||
extern struct ass_track_s *ass_track;
|
extern struct ass_track *ass_track;
|
||||||
extern subtitle *vo_sub_last;
|
extern subtitle *vo_sub_last;
|
||||||
|
|
||||||
void print_version(const char* name);
|
void print_version(const char* name);
|
||||||
|
|
Loading…
Reference in New Issue