diff options
author | Clément Bœsch <ubitux@gmail.com> | 2012-12-27 14:49:33 +0100 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 22:37:25 +0100 |
commit | 5f02844c8d4fc93972932a84f0a5cbb02fe12a00 (patch) | |
tree | ed243e820b345c9591b78db8dbe8a4616371d8c4 /libavcodec/codec_desc.c | |
parent | 2d3305e4f41f2c3fdf22e729d4ec753fb885a8f1 (diff) | |
download | ffmpeg-5f02844c8d4fc93972932a84f0a5cbb02fe12a00.tar.gz |
Add MPL2 subtitles demuxer and decoder.
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 27544f1a04..8de4be107e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2405,6 +2405,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("MicroDVD subtitle"), }, { + .id = AV_CODEC_ID_MPL2, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "mpl2", + .long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitle"), + }, + { .id = AV_CODEC_ID_EIA_608, .type = AVMEDIA_TYPE_SUBTITLE, .name = "eia_608", |