summaryrefslogtreecommitdiff
path: root/libavcodec/mjpeg.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-05-14 11:53:27 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-05-14 11:53:27 +0000
commit37c26ae9ff72765c5470dba121408987e1f37273 (patch)
tree7e48fd63e80c43db1ea75fedb8ec7df24e176c77 /libavcodec/mjpeg.c
parent7fcf41091eabe2a8fed9707a794e14ba8847bf1c (diff)
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
Diffstat (limited to 'libavcodec/mjpeg.c')
-rw-r--r--libavcodec/mjpeg.c5
1 files changed, 1 insertions, 4 deletions
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);