From 7fcf41091eabe2a8fed9707a794e14ba8847bf1c Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 13 May 2007 23:22:05 +0000 Subject: [PATCH] jpegls encoder does not call this function, so remove useless tests Originally committed as revision 9022 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mjpeg.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index bc32865f71..794e1eb957 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -335,9 +335,6 @@ static void jpeg_put_comments(MpegEncContext *s) void mjpeg_picture_header(MpegEncContext *s) { const int lossless= s->avctx->codec_id != CODEC_ID_MJPEG; - const int ls = s->avctx->codec_id == CODEC_ID_JPEGLS; - - assert(!(ls && s->mjpeg_write_tables)); put_marker(&s->pb, SOI); @@ -350,7 +347,6 @@ void mjpeg_picture_header(MpegEncContext *s) switch(s->avctx->codec_id){ case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break; case CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break; - case CODEC_ID_JPEGLS: put_marker(&s->pb, SOF48); break; default: assert(0); } @@ -410,18 +406,15 @@ void mjpeg_picture_header(MpegEncContext *s) put_bits(&s->pb, 4, 1); /* DC huffman table index */ put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */ - put_bits(&s->pb, 8, (lossless && !ls) ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */ + put_bits(&s->pb, 8, lossless ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */ switch(s->avctx->codec_id){ case CODEC_ID_MJPEG: put_bits(&s->pb, 8, 63); break; /* Se (not used) */ case CODEC_ID_LJPEG: put_bits(&s->pb, 8, 0); break; /* not used */ - case CODEC_ID_JPEGLS: put_bits(&s->pb, 8, 1); break; /* ILV = line interleaved */ default: assert(0); } put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ - - //FIXME DC/AC entropy table selectors stuff in jpegls } static void escape_FF(MpegEncContext *s, int start)