summaryrefslogtreecommitdiff
path: root/libavcodec/codec_desc.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-07-25 12:23:31 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-10-15 08:32:18 +0200
commitcd559bb49a3417ab1ca75df3de0029300e5095df (patch)
tree7819ecb065e546cbed1e518ca0798886f3b44494 /libavcodec/codec_desc.c
parent35782bfbca0abe39e33d65a771834c6b87855c16 (diff)
lavc: add xface image decoder and encoder
Based on libcompface code by James Ashton <James.Ashton@anu.edu.au>, and relicensed to LGPL with the author's consent.
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 d411981606..fcefea4ae7 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1315,6 +1315,12 @@ static const AVCodecDescriptor codec_descriptors[] = {
.name = "cpia",
.long_name = NULL_IF_CONFIG_SMALL("CPiA video format"),
},
+ {
+ .id = AV_CODEC_ID_XFACE,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "xface",
+ .long_name = NULL_IF_CONFIG_SMALL("X-face image"),
+ },
/* various PCM "codecs" */
{