[FFmpeg-cvslog] lavc: add codec descriptors for TTF and OTF.

Nicolas George git at videolan.org
Tue Apr 29 19:43:49 CEST 2014


ffmpeg | branch: master | Nicolas George <george at nsup.org> | Wed Apr 16 23:01:52 2014 +0200| [892e2c2ad8ea2b2a154edc572276997df5d06dd0] | committer: Nicolas George

lavc: add codec descriptors for TTF and OTF.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=892e2c2ad8ea2b2a154edc572276997df5d06dd0
---

 libavcodec/codec_desc.c  |   12 ++++++++++++
 tools/missing_codec_desc |    1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 0595015..e461a10 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 093d02e..e1d3d60 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



More information about the ffmpeg-cvslog mailing list