diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-12-27 22:36:47 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 22:46:42 +0100 |
| commit | 5c68aae90883497d59a2a49cf75816cf5906e14a (patch) | |
| tree | 83ede8ebe1751d4d3af4946ff8b8a1bd27a41c54 /libavcodec/codec_desc.c | |
| parent | 5f02844c8d4fc93972932a84f0a5cbb02fe12a00 (diff) | |
| download | ffmpeg-5c68aae90883497d59a2a49cf75816cf5906e14a.tar.gz | |
Add VPlayer subtitles demuxer and decoder.
Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit.
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 8de4be107e..2ea5e99629 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2441,6 +2441,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle"), }, { + .id = AV_CODEC_ID_VPLAYER, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "vplayer", + .long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitle"), + }, + { .id = AV_CODEC_ID_WEBVTT, .type = AVMEDIA_TYPE_SUBTITLE, .name = "webvtt", |