github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

Move sh_sub_t to stheader.h, where all the other sh structs are defined 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-13 18:38:29 +00:00
parent 656bde87fa
commit 48c301ddbc
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libmpdemux/demuxer.h
View File

@ -127,20 +127,6 @@ typedef struct demuxer_info_st {
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

14
libmpdemux/stheader.h
View File

@ -90,6 +90,20 @@ typedef struct {
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);