Author: reimar Date: Mon Nov 13 19:38:29 2006 New Revision: 20892 Modified: trunk/libmpdemux/demuxer.h trunk/libmpdemux/stheader.h Log: Move sh_sub_t to stheader.h, where all the other sh structs are defined Modified: trunk/libmpdemux/demuxer.h ============================================================================== --- trunk/libmpdemux/demuxer.h (original) +++ trunk/libmpdemux/demuxer.h Mon Nov 13 19:38:29 2006 @@ -127,20 +127,6 @@ char *copyright; } demuxer_info_t; -typedef struct { - 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; -#ifdef USE_ASS - ass_track_t* ass_track; // for SSA/ASS streams (type == 'a') -#endif -} sh_sub_t; - #define MAX_A_STREAMS 256 #define MAX_V_STREAMS 256 #define MAX_S_STREAMS 32 Modified: trunk/libmpdemux/stheader.h ============================================================================== --- trunk/libmpdemux/stheader.h (original) +++ trunk/libmpdemux/stheader.h Mon Nov 13 19:38:29 2006 @@ -90,6 +90,20 @@ void* context; // codec-specific stuff (usually HANDLE or struct pointer) } sh_video_t; +typedef struct { + 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; +#ifdef USE_ASS + ass_track_t* ass_track; // for SSA/ASS streams (type == 'a') +#endif +} sh_sub_t; + // demuxer.c: #define new_sh_audio(d, i) new_sh_audio_aid(d, i, i) sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid);