summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-03-17 17:43:58 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2012-03-17 15:45:04 -0400
commit0afd8f12e974c14112c6c3d8ae363c074b963711 (patch)
tree3f8c8f32edc95eb590571d3f27535744a4cf8810 /libavformat
parent6ca3b248e21fc48418c4221fc92c2eecaf07cb9b (diff)
avcodec: add XBM encoder
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/img2.c1
-rw-r--r--libavformat/img2enc.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 6915e433f6..b1495ff947 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -64,6 +64,7 @@ static const IdStrMap img_tags[] = {
{ CODEC_ID_JPEG2000 , "jpc"},
{ CODEC_ID_DPX , "dpx"},
{ CODEC_ID_PICTOR , "pic"},
+ { CODEC_ID_XBM , "xbm"},
{ CODEC_ID_XWD , "xwd"},
{ CODEC_ID_NONE , NULL}
};
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 8fbe37e33e..c825c2bf23 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -130,7 +130,7 @@ AVOutputFormat ff_image2_muxer = {
.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,xwd,sun,ras,rs,im1,im8,im24,"
- "sunras",
+ "sunras,xbm",
.priv_data_size = sizeof(VideoMuxData),
.video_codec = CODEC_ID_MJPEG,
.write_header = write_header,