Mercurial > libavcodec.hg
changeset 5005:3aba3479d806 libavcodec
remove some unused mjpeg encoding variables
(they were always set to a constant value)
| author | aurel |
|---|---|
| date | Mon, 14 May 2007 11:53:27 +0000 |
| parents | 5c3c39298e91 |
| children | 28ebdd244a07 |
| files | mjpeg.c mpegvideo.c mpegvideo.h |
| diffstat | 3 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mjpeg.c Sun May 13 23:22:05 2007 +0000 +++ b/mjpeg.c Mon May 14 11:53:27 2007 +0000 @@ -338,11 +338,9 @@ 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 @@ #else put_bits(&s->pb, 8, 0); /* select matrix */ #endif - } /* scan header */ put_marker(&s->pb, SOS);
--- a/mpegvideo.c Sun May 13 23:22:05 2007 +0000 +++ b/mpegvideo.c Mon May 14 11:53:27 2007 +0000 @@ -1197,8 +1197,6 @@ case CODEC_ID_MJPEG: s->out_format = FMT_MJPEG; s->intra_only = 1; /* force intra only for jpeg */ - s->mjpeg_write_tables = 1; - s->mjpeg_data_only_frames = 0; /* write all the needed headers */ s->mjpeg_vsample[0] = 2; s->mjpeg_vsample[1] = 2>>chroma_v_shift; s->mjpeg_vsample[2] = 2>>chroma_v_shift;
--- a/mpegvideo.h Sun May 13 23:22:05 2007 +0000 +++ b/mpegvideo.h Mon May 14 11:53:27 2007 +0000 @@ -589,8 +589,6 @@ struct MJpegContext *mjpeg_ctx; int mjpeg_vsample[3]; ///< vertical sampling factors, default = {2, 1, 1} int mjpeg_hsample[3]; ///< horizontal sampling factors, default = {2, 1, 1} - int mjpeg_write_tables; ///< do we want to have quantisation- and huffmantables in the jpeg file ? - int mjpeg_data_only_frames; ///< frames only with SOI, SOS and EOI markers /* MSMPEG4 specific */ int mv_table_index;