diff options
| -rw-r--r-- | libavcodec/mjpeg.c | 5 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
3 files changed, 1 insertions, 8 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); diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index a7bd7cc3a9..755a506b11 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 15938aa8bb..389694ca0b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -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; |