summaryrefslogtreecommitdiff
path: root/libavcodec/codec_desc.c
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2012-08-28 21:02:25 -0700
committerPhilip Langdale <philipl@overt.org>2012-08-29 09:18:05 -0700
commit7816c7e7728d5094d52c34652a504c38ebfc4628 (patch)
treef7a827e713c48c745c7b8a1d7ce08c8b53b4b72d /libavcodec/codec_desc.c
parent8579d4b2f0cc7d46dc75e0a0e42d556d653463fc (diff)
Add missing codec descriptor for timingless subrip.
Signed-off-by: Philip Langdale <philipl@overt.org>
Diffstat (limited to 'libavcodec/codec_desc.c')
-rw-r--r--libavcodec/codec_desc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index dd4870dea7..0385f9c4b4 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2052,7 +2052,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_SRT,
.type = AVMEDIA_TYPE_SUBTITLE,
.name = "srt",
- .long_name = NULL_IF_CONFIG_SMALL("SubRip Text"),
+ .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle with embedded timing"),
+ },
+ {
+ .id = AV_CODEC_ID_SUBRIP,
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .name = "subrip",
+ .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
},
{
.id = AV_CODEC_ID_MICRODVD,