diff options
| author | Nicolas George <george@nsup.org> | 2014-04-16 23:01:52 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2014-04-29 13:24:18 +0200 |
| commit | 892e2c2ad8ea2b2a154edc572276997df5d06dd0 (patch) | |
| tree | 907bdf717c5f34881bbcb285025da4de1e98a9c5 | |
| parent | fa7bc7ed8b213ee96ebfe0198235169c3c556b7e (diff) | |
| download | ffmpeg-892e2c2ad8ea2b2a154edc572276997df5d06dd0.tar.gz | |
lavc: add codec descriptors for TTF and OTF.
| -rw-r--r-- | libavcodec/codec_desc.c | 12 | ||||
| -rwxr-xr-x | tools/missing_codec_desc | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0595015e49..e461a10826 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2652,6 +2652,12 @@ static const AVCodecDescriptor codec_descriptors[] = { /* other kind of codecs and pseudo-codecs */ { + .id = AV_CODEC_ID_TTF, + .type = AVMEDIA_TYPE_DATA, + .name = "ttf", + .long_name = NULL_IF_CONFIG_SMALL("TrueType font"), + }, + { .id = AV_CODEC_ID_BINTEXT, .type = AVMEDIA_TYPE_VIDEO, .name = "bintext", @@ -2673,6 +2679,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY, }, { + .id = AV_CODEC_ID_OTF, + .type = AVMEDIA_TYPE_DATA, + .name = "otf", + .long_name = NULL_IF_CONFIG_SMALL("OpenType font"), + }, + { .id = AV_CODEC_ID_SMPTE_KLV, .type = AVMEDIA_TYPE_DATA, .name = "klv", diff --git a/tools/missing_codec_desc b/tools/missing_codec_desc index 093d02e02e..e1d3d60b4f 100755 --- a/tools/missing_codec_desc +++ b/tools/missing_codec_desc @@ -14,7 +14,6 @@ known_AV_CODEC_ID_NONE=1 known_AV_CODEC_ID_FIRST_AUDIO=1 known_AV_CODEC_ID_FIRST_SUBTITLE=1 known_AV_CODEC_ID_FIRST_UNKNOWN=1 -known_AV_CODEC_ID_TTF=1 known_AV_CODEC_ID_PROBE=1 known_AV_CODEC_ID_MPEG2TS=1 known_AV_CODEC_ID_MPEG4SYSTEMS=1 |