diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-07 18:26:51 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-07 18:26:51 +0000 |
| commit | e15ae9a60043d8d9c1b110607c5059f13ca86421 (patch) | |
| tree | 22b3b039cdc936ae7063c5fd0092c2c837292d0f /libmpdemux/demuxer.h | |
| parent | 2f2d8cef15ccef7f2e0882a482a4fa071054778d (diff) | |
| download | mpv-e15ae9a60043d8d9c1b110607c5059f13ca86421.tar.bz2 mpv-e15ae9a60043d8d9c1b110607c5059f13ca86421.tar.xz | |
Initial libass release (without mencoder support).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 46642a51a1..9ca3e3a7ac 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -1,6 +1,10 @@ #ifndef __DEMUXER_H #define __DEMUXER_H 1 +#ifdef USE_ASS +#include "libass/ass_types.h" +#endif + #define MAX_PACKS 4096 #ifdef HAVE_TV_BSDBT848 #define MAX_PACK_BYTES 0x2000000 @@ -122,13 +126,16 @@ typedef struct demuxer_info_st { } demuxer_info_t; typedef struct { - char type; // t = text, v = VobSub + 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 |