diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-29 20:25:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-29 20:25:23 +0200 |
| commit | affd5018ac35617460b567f0e8e712d4d2d34c58 (patch) | |
| tree | f7d14a1ca8c3e1189f1503f160a2e79a6fd80a08 | |
| parent | 9a0e40ec8c0c0b04f32173f65ef73a6cc370d17a (diff) | |
| parent | 00a61ac7559baf4768953f05346feccc965392b2 (diff) | |
| download | ffmpeg-affd5018ac35617460b567f0e8e712d4d2d34c58.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Recognize j2k as file suffix for the image2 muxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/img2enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index fb297da20b..a2b61d7da3 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -148,7 +148,7 @@ AVOutputFormat ff_image2_muxer = { .name = "image2", .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .extensions = "bmp,dpx,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png," - "ppm,sgi,tga,tif,tiff,jp2,j2c,xwd,sun,ras,rs,im1,im8,im24," + "ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8,im24," "sunras,xbm,xface", .priv_data_size = sizeof(VideoMuxData), .video_codec = AV_CODEC_ID_MJPEG, |