diff options
author | Clément Bœsch <ubitux@gmail.com> | 2012-12-28 05:15:00 +0100 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 23:55:28 +0100 |
commit | 7b43402724b21cca805c8afac6ec33a211d52b85 (patch) | |
tree | ab285806766de979f79df1f47bc716cd4cc98d94 /libavcodec/codec_desc.c | |
parent | 580ee973d16cb5afb3d5974133576d6c570d2dda (diff) | |
download | ffmpeg-streaming-7b43402724b21cca805c8afac6ec33a211d52b85.zip ffmpeg-streaming-7b43402724b21cca805c8afac6ec33a211d52b85.tar.gz |
Add PJS 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 2ea5e99..13ebcec 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", |