summaryrefslogtreecommitdiffstats
path: root/libmpdemux/matroska.h
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-19 19:16:10 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-19 19:16:10 +0000
commitd6fad182c2f6aba9eb07c750052ab0b20d9dbf24 (patch)
tree3fcaf3e320ea69dcf19b874d7b2a3fc6eff803fe /libmpdemux/matroska.h
parente482826611feee90cea2d85004cf3ee4210a8ddf (diff)
downloadmpv-d6fad182c2f6aba9eb07c750052ab0b20d9dbf24.tar.bz2
mpv-d6fad182c2f6aba9eb07c750052ab0b20d9dbf24.tar.xz
Added the new C based Matroska demuxer by Aurelien Jacobs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11808 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/matroska.h')
-rw-r--r--libmpdemux/matroska.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h
index f9a1490d78..0d76f30f69 100644
--- a/libmpdemux/matroska.h
+++ b/libmpdemux/matroska.h
@@ -47,7 +47,10 @@
#define MKV_S_TEXTASCII "S_TEXT/ASCII"
#define MKV_S_TEXTUTF8 "S_TEXT/UTF8"
#define MKV_S_TEXTSSA "S_TEXT/SSA"
+#define MKV_S_TEXTASS "S_TEXT/ASS"
#define MKV_S_VOBSUB "S_VOBSUB"
+#define MKV_S_SSA "S_SSA" // Deprecated
+#define MKV_S_ASS "S_ASS" // Deprecated
typedef struct {
char type; // t = text, v = VobSub