summaryrefslogtreecommitdiff
path: root/libavformat/img2.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-01-21 17:45:52 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2012-01-23 19:04:35 +0100
commit27ed027bcdcb7445ab62d4870a8be3615ffc1e31 (patch)
tree73bd9200385a5fc89837a1301587d34da8d1c896 /libavformat/img2.c
parent7662a532fbb83d5b3e559a7da58254e56cae3157 (diff)
XWD encoder and decoder
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavformat/img2.c')
-rw-r--r--libavformat/img2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 2af561c2ce..e3e7d11e43 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -85,6 +85,7 @@ static const IdStrMap img_tags[] = {
{ CODEC_ID_JPEG2000 , "jpc"},
{ CODEC_ID_DPX , "dpx"},
{ CODEC_ID_PICTOR , "pic"},
+ { CODEC_ID_XWD , "xwd"},
{ CODEC_ID_NONE , NULL}
};
@@ -501,7 +502,7 @@ AVOutputFormat ff_image2_muxer = {
.name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.extensions = "bmp,dpx,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
- "ppm,sgi,tga,tif,tiff,jp2",
+ "ppm,sgi,tga,tif,tiff,jp2,xwd",
.priv_data_size = sizeof(VideoData),
.video_codec = CODEC_ID_MJPEG,
.write_header = write_header,