summaryrefslogtreecommitdiff
path: root/libavcodec/codec_desc.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-12-28 05:15:00 +0100
committerClément Bœsch <ubitux@gmail.com>2012-12-30 23:55:28 +0100
commit7b43402724b21cca805c8afac6ec33a211d52b85 (patch)
treeab285806766de979f79df1f47bc716cd4cc98d94 /libavcodec/codec_desc.c
parent580ee973d16cb5afb3d5974133576d6c570d2dda (diff)
Add PJS subtitles demuxer and decoder.
Diffstat (limited to 'libavcodec/codec_desc.c')
-rw-r--r--libavcodec/codec_desc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 2ea5e99629..13ebcecef6 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2423,6 +2423,12 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle"),
},
{
+ .id = AV_CODEC_ID_PJS,
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .name = "pjs",
+ .long_name = NULL_IF_CONFIG_SMALL("PJS (Phoenix Japanimation Society) subtitle"),
+ },
+ {
.id = AV_CODEC_ID_SAMI,
.type = AVMEDIA_TYPE_SUBTITLE,
.name = "sami",