diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-06-20 14:47:38 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-06-20 14:47:38 +0000 |
| commit | df028e8c6af3516b7347b093c7240c6bb6391ddc (patch) | |
| tree | 3c725b26f1a73bad877fc1fd0b181e988f759023 /libavformat/img2.c | |
| parent | 630c97ff4b81e5c631c33f1d803d69531f781fb3 (diff) | |
| download | ffmpeg-df028e8c6af3516b7347b093c7240c6bb6391ddc.tar.gz | |
Revert r19239: It broke four conformance tests.
Originally committed as revision 19241 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"}, |