diff options
| author | Matthew Heaney <matthewjheaney@google.com> | 2013-08-08 15:40:03 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-19 22:34:57 +0200 |
| commit | 818ebe930fa426ac73368f8aaccf4782fcbf3f92 (patch) | |
| tree | acbc90b829843686dadf9b5434f96973fbdf3436 /libavformat/matroska.c | |
| parent | 23b3141261b7ffed5f512eebbd8d82001ebf8523 (diff) | |
| download | ffmpeg-818ebe930fa426ac73368f8aaccf4782fcbf3f92.tar.gz | |
avformat/matroskadec: add WebVTT support
WebM files now support inband text tracks, as described in the
following specification:
http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm
The Matroska demuxer now detects the presence of WebVTT tracks,
synthesizing WebVTT packets (having codec id AV_CODEC_ID_WEBVTT) and
pushing them downstream in the normal way.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index ee57c1820a..953c5721b6 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -57,6 +57,11 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_VORBIS" , AV_CODEC_ID_VORBIS}, {"A_WAVPACK4" , AV_CODEC_ID_WAVPACK}, + {"D_WEBVTT/SUBTITLES" , AV_CODEC_ID_WEBVTT}, + {"D_WEBVTT/CAPTIONS" , AV_CODEC_ID_WEBVTT}, + {"D_WEBVTT/DESCRIPTIONS", AV_CODEC_ID_WEBVTT}, + {"D_WEBVTT/METADATA" , AV_CODEC_ID_WEBVTT}, + {"S_TEXT/UTF8" , AV_CODEC_ID_SUBRIP}, {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT}, {"S_TEXT/UTF8" , AV_CODEC_ID_SRT}, |