From df028e8c6af3516b7347b093c7240c6bb6391ddc Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 20 Jun 2009 14:47:38 +0000 Subject: Revert r19239: It broke four conformance tests. Originally committed as revision 19241 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/img2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/img2.c') diff --git a/libavformat/img2.c b/libavformat/img2.c index ec32f863e8..88c74246e4 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -42,7 +42,7 @@ typedef struct { static const IdStrMap img_tags[] = { { CODEC_ID_MJPEG , "jpeg"}, { CODEC_ID_MJPEG , "jpg"}, - { CODEC_ID_LJPEG , "ljpg"}, + { CODEC_ID_JPEGLS , "ljpg"}, { CODEC_ID_PNG , "png"}, { CODEC_ID_PNG , "mng"}, { CODEC_ID_PPM , "ppm"}, -- cgit v1.2.3