diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-12-19 03:08:08 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-12-19 03:08:08 +0000 |
| commit | 2ceff404b5416035ae05caad39bbdfe56a31064a (patch) | |
| tree | c058d7fd389a88df2736339b57f33feb8812330f | |
| parent | 0888fd220cfba8b372a72100afd85f13b948af51 (diff) | |
| download | ffmpeg-2ceff404b5416035ae05caad39bbdfe56a31064a.tar.gz | |
forgot
Originally committed as revision 4756 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 743e992dac..393a98f55d 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1115,10 +1115,11 @@ int MPV_encode_init(AVCodecContext *avctx) s->rtp_mode= 1; break; case CODEC_ID_LJPEG: + case CODEC_ID_JPEGLS: case CODEC_ID_MJPEG: s->out_format = FMT_MJPEG; s->intra_only = 1; /* force intra only for jpeg */ - s->mjpeg_write_tables = 1; /* write all tables */ + s->mjpeg_write_tables = avctx->codec->id != CODEC_ID_JPEGLS; s->mjpeg_data_only_frames = 0; /* write all the needed headers */ s->mjpeg_vsample[0] = 1<<chroma_v_shift; s->mjpeg_vsample[1] = 1; |