summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-13 18:38:29 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-13 18:38:29 +0000
commit48c301ddbcd5a1f4d396a3ccb8a8b00426f6b48b (patch)
treee3cef9b05980379fde688472272edb080d39d150 /libmpdemux/demuxer.h
parent656bde87fa9adfe6539b791042054097c1bcc79d (diff)
downloadmpv-48c301ddbcd5a1f4d396a3ccb8a8b00426f6b48b.tar.bz2
mpv-48c301ddbcd5a1f4d396a3ccb8a8b00426f6b48b.tar.xz
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
Diffstat (limited to 'libmpdemux/demuxer.h')
-rw-r--r--libmpdemux/demuxer.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 973887865b..49f3625e01 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -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