[SCM] libav/experimental: img2: add j2c file extension

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6d78e852fbf3cab438a2085bcb64b90457c4a851
Author: Jean First <jeanfirst at gmail.com>
Date:   Sun Jan 22 00:11:42 2012 +0000

    img2: add j2c file extension
    
    Some applications use the j2c extension for jpeg2000 codestream files.

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 493df6d..ed59281 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 4cc5c3f..f4a80aa 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,

-- 
Libav/FFmpeg packaging