diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-12 22:50:12 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-12 22:50:12 +0000 |
| commit | cf329752227e5a3b56b4eea75ea86e9570a81891 (patch) | |
| tree | 85cd4a72889f9d58bd949fb9b4c681321e31326f | |
| parent | 4440b1188ebc1e9fc901bccfcee384423b0a264f (diff) | |
| download | ffmpeg-cf329752227e5a3b56b4eea75ea86e9570a81891.tar.gz | |
jpegls never call this code, so those tests are useless
Originally committed as revision 9009 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2bf4af171e..0d312bbd81 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1194,11 +1194,10 @@ 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 = avctx->codec->id != CODEC_ID_JPEGLS; + 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; |