summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-13 16:15:23 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-13 16:15:23 +0000
commitc5fa0bbf92c98fbfd859885147427cb1600c628c (patch)
tree99f10096ec2ebfaea7444ba97ea43cab701df8df /libmpdemux/demuxer.h
parentd189145a4aec732670fa8105b4201a6b4c81e7c4 (diff)
downloadmpv-c5fa0bbf92c98fbfd859885147427cb1600c628c.tar.bz2
mpv-c5fa0bbf92c98fbfd859885147427cb1600c628c.tar.xz
Make subtitle stream handling more similar to audio and video streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.h')
-rw-r--r--libmpdemux/demuxer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index bc2c79cff8..973887865b 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -128,6 +128,7 @@ typedef struct demuxer_info_st {
} 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
@@ -142,6 +143,7 @@ typedef struct {
#define MAX_A_STREAMS 256
#define MAX_V_STREAMS 256
+#define MAX_S_STREAMS 32
struct demuxer_st;
@@ -199,7 +201,7 @@ typedef struct demuxer_st {
// stream headers:
void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t)
void* v_streams[MAX_V_STREAMS]; // video sterams (sh_video_t)
- char s_streams[32]; // dvd subtitles (flag)
+ void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag)
demux_chapter_t* chapters;
int num_chapters;