From 37c26ae9ff72765c5470dba121408987e1f37273 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Mon, 14 May 2007 11:53:27 +0000 Subject: remove some unused mjpeg encoding variables (they were always set to a constant value) Originally committed as revision 9023 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mjpeg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libavcodec/mjpeg.c') diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 794e1eb957..1b04d0f1b0 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -338,11 +338,9 @@ void mjpeg_picture_header(MpegEncContext *s) put_marker(&s->pb, SOI); - if (!s->mjpeg_data_only_frames) - { jpeg_put_comments(s); - if (s->mjpeg_write_tables) jpeg_table_header(s); + jpeg_table_header(s); switch(s->avctx->codec_id){ case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break; @@ -384,7 +382,6 @@ void mjpeg_picture_header(MpegEncContext *s) #else put_bits(&s->pb, 8, 0); /* select matrix */ #endif - } /* scan header */ put_marker(&s->pb, SOS); -- cgit v1.2.3