From c73217c07a98013887f507849c18eeac1257df58 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Wed, 29 Jul 2009 01:11:33 +0300 Subject: Change libass type names to match upstream renames --- libmpdemux/stheader.h | 2 +- mp_core.h | 2 +- mpcommon.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index f80cd2cf6a..4ba42855cd 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -123,7 +123,7 @@ typedef struct sh_sub { char type; // t = text, v = VobSub, a = SSA/ASS unsigned char* extradata; // extra header data passed from demuxer 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 int default_track; } sh_sub_t; diff --git a/mp_core.h b/mp_core.h index 31e867c7d3..4092e49efb 100644 --- a/mp_core.h +++ b/mp_core.h @@ -152,7 +152,7 @@ typedef struct MPContext { int global_sub_indices[SUB_SOURCES]; // set_of_ass_tracks[i] contains subtitles from set_of_subtitles[i] // 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]; int file_format; diff --git a/mpcommon.h b/mpcommon.h index c9bfd92122..211145abfc 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -6,7 +6,7 @@ #include "libmpdemux/stheader.h" extern double sub_last_pts; -extern struct ass_track_s *ass_track; +extern struct ass_track *ass_track; extern subtitle *vo_sub_last; void print_version(const char* name); -- cgit v1.2.3