RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Aurelien Jacobs 2007-05-14 11:53:27 +00:00
parent 7fcf41091e
commit 37c26ae9ff
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mjpeg.c
View File

@ -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);

2
libavcodec/mpegvideo.c
View File

@ -1197,8 +1197,6 @@ int MPV_encode_init(AVCodecContext *avctx)
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;

2
libavcodec/mpegvideo.h
View File

@ -589,8 +589,6 @@ typedef struct MpegEncContext {
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;