aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroska.h
diff options
context:
space:
mode:
authorMatthew Heaney <matthewjheaney@google.com>2013-07-08 16:25:30 -0700
committerMichael Niedermayer <michaelni@gmx.at>2013-07-09 03:09:12 +0200
commit509642b4bd8411d3a6965e97cf7dacc3c45fe92a (patch)
treed6a254a7b1013368527250a30a9a71e4ec853a10 /libavformat/matroska.h
parenta20f049c2ab5c0d6cfd4c491cb3b9a16db33b683 (diff)
downloadffmpeg-509642b4bd8411d3a6965e97cf7dacc3c45fe92a.tar.gz
WebM muxer writes WebVTT subtitle track
The Matroska muxer now allows WebVTT subtitle tracks to be written while in WebM muxing mode. WebVTT subtitle tracks have four kinds: "subtitles", "captions", "descriptions", and "metadata". Each text track kind has a distinct Mastroska CodecID and track type, as described in the temporal metadata guidelines here: http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm When the stream has codec id AV_CODEC_ID_WEBVTT, the stream packet is serialized per the temporal metadata guidelines cited above. The WebVTT cue is written as a Matroska block group. The block frame comprises the WebVTT cue id, followed by the cue settings, followed by the cue text. (The block timestamp is synthesized from the cue timestamp.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
-rw-r--r--libavformat/matroska.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index af662bea4d..886a34636d 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -230,6 +230,7 @@ typedef enum {
MATROSKA_TRACK_TYPE_LOGO = 0x10,
MATROSKA_TRACK_TYPE_SUBTITLE = 0x11,
MATROSKA_TRACK_TYPE_CONTROL = 0x20,
+ MATROSKA_TRACK_TYPE_METADATA = 0x21,
} MatroskaTrackType;
typedef enum {