jpegls never call this code, so those tests are useless

Originally committed as revision 9009 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Aurelien Jacobs 18 years ago
parent 4440b1188e
commit cf32975222
  1. 3
      libavcodec/mpegvideo.c

@ -1194,11 +1194,10 @@ int MPV_encode_init(AVCodecContext *avctx)
s->rtp_mode= 1; s->rtp_mode= 1;
break; break;
case CODEC_ID_LJPEG: case CODEC_ID_LJPEG:
case CODEC_ID_JPEGLS:
case CODEC_ID_MJPEG: case CODEC_ID_MJPEG:
s->out_format = FMT_MJPEG; s->out_format = FMT_MJPEG;
s->intra_only = 1; /* force intra only for jpeg */ 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_data_only_frames = 0; /* write all the needed headers */
s->mjpeg_vsample[0] = 2; s->mjpeg_vsample[0] = 2;
s->mjpeg_vsample[1] = 2>>chroma_v_shift; s->mjpeg_vsample[1] = 2>>chroma_v_shift;

Loading…
Cancel
Save