[FFmpeg-cvslog] r19241 - in trunk: libavcodec/h264.c libavformat/img2.c

[Jai Menon]

On Sat, Jun 20, 2009 at 2:47 PM, cehoyos<subversion at mplayerhq.hu> wrote:
> Author: cehoyos
> Date: Sat Jun 20 16:47:38 2009
> New Revision: 19241
>
> Log:
> Revert r19239: It broke four conformance tests.
>
> Modified:
> ? trunk/libavcodec/h264.c
> ? trunk/libavformat/img2.c

[...]

> Modified: trunk/libavformat/img2.c
> ==============================================================================
> --- trunk/libavformat/img2.c ? ?Sat Jun 20 15:36:21 2009 ? ? ? ?(r19240)
> +++ trunk/libavformat/img2.c ? ?Sat Jun 20 16:47:38 2009 ? ? ? ?(r19241)
> @@ -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"},

I guess this part wasn't intended :)


-- 
Regards,

Jai