summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJean First <jeanfirst@gmail.com>2012-01-22 00:11:42 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-03-16 23:31:29 +0100
commit6d78e852fbf3cab438a2085bcb64b90457c4a851 (patch)
tree4f6e358e90a51cfa93328240e819af5b0ba2873c /libavformat
parent58c215961a9067bb670387bbd72286c30de04b93 (diff)
img2: add j2c file extension
Some applications use the j2c extension for jpeg2000 codestream files.
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 493df6d77e..ed592815a5 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -63,6 +63,7 @@ static const IdStrMap img_tags[] = {
{ AV_CODEC_ID_SUNRAST, "im8" },
{ AV_CODEC_ID_SUNRAST, "im24" },
{ AV_CODEC_ID_SUNRAST, "sunras" },
+ { AV_CODEC_ID_JPEG2000, "j2c" },
{ AV_CODEC_ID_JPEG2000, "jp2" },
{ AV_CODEC_ID_JPEG2000, "jpc" },
{ AV_CODEC_ID_JPEG2000, "j2k" },
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 4cc5c3feac..f4a80aa999 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -148,7 +148,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,webp,xbm",
+ "sunras,webp,xbm,j2c",
.priv_data_size = sizeof(VideoMuxData),
.video_codec = AV_CODEC_ID_MJPEG,
.write_header = write_header,