aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/img2.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-06-20 14:51:03 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-06-20 14:51:03 +0000
commita481293f130e1a70d922beddf3f5401aca2b966a (patch)
tree6218f8f6dd5eba6900d31b13f76d785c1e36aa11 /libavformat/img2.c
parentdf028e8c6af3516b7347b093c7240c6bb6391ddc (diff)
downloadffmpeg-a481293f130e1a70d922beddf3f5401aca2b966a.tar.gz
Revert unintended hunk of r19241.
Originally committed as revision 19242 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/img2.c')
-rw-r--r--libavformat/img2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 88c74246e4..ec32f863e8 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_JPEGLS , "ljpg"},
+ { CODEC_ID_LJPEG , "ljpg"},
{ CODEC_ID_PNG , "png"},
{ CODEC_ID_PNG , "mng"},
{ CODEC_ID_PPM , "ppm"},