virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

jpegls encoder does not call this function, so remove useless tests

Browse Source 
Originally committed as revision 9022 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-05-13 23:22:05 +00:00
parent 6ba04c2b03
commit 7fcf41091e
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mjpeg.c
View File

@ -335,9 +335,6 @@ static void jpeg_put_comments(MpegEncContext *s)
void mjpeg_picture_header(MpegEncContext *s) void mjpeg_picture_header(MpegEncContext *s)
{ {
const int lossless= s->avctx->codec_id != CODEC_ID_MJPEG; 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); put_marker(&s->pb, SOI);
@ -350,7 +347,6 @@ void mjpeg_picture_header(MpegEncContext *s)
switch(s->avctx->codec_id){ switch(s->avctx->codec_id){
case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break; case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break;
case CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break; case CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break;
case CODEC_ID_JPEGLS: put_marker(&s->pb, SOF48); break;
default: assert(0); 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, 1); /* DC huffman table index */
put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC 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){ switch(s->avctx->codec_id){
case CODEC_ID_MJPEG: put_bits(&s->pb, 8, 63); break; /* Se (not used) */ 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_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); default: assert(0);
} }
put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ 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) static void escape_FF(MpegEncContext *s, int start)