diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-07-06 10:04:02 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-07-06 10:04:02 +0200 |
| commit | 923cff747a0f31b0e120e1899a4b807fb8137484 (patch) | |
| tree | 966e91727befd644e146dbf2184234d365de3d95 /libavformat/img2.c | |
| parent | aa61ca0c592b6169edf82990078579ada49a3332 (diff) | |
Support extension jls for jpeg-ls.
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index b6082c68f8..ca391aa1bb 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -54,6 +54,7 @@ static const IdStrMap img_tags[] = { { CODEC_ID_MJPEG , "jpeg"}, { CODEC_ID_MJPEG , "jpg"}, { CODEC_ID_LJPEG , "ljpg"}, + { CODEC_ID_JPEGLS , "jls"}, { CODEC_ID_PNG , "png"}, { CODEC_ID_PNG , "mng"}, { CODEC_ID_PPM , "ppm"}, @@ -505,7 +506,7 @@ AVInputFormat ff_image2pipe_demuxer = { 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," + .extensions = "bmp,dpx,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png," "ppm,sgi,tga,tif,tiff,jp2", .priv_data_size = sizeof(VideoData), .video_codec = CODEC_ID_MJPEG, |