mjpegdec.c (libav-12) | : | mjpegdec.c (libav-12.1) | ||
---|---|---|---|---|
skipping to change at line 1107 | skipping to change at line 1107 | |||
if (s->avctx->debug & FF_DEBUG_PICT_INFO) | if (s->avctx->debug & FF_DEBUG_PICT_INFO) | |||
av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d ilv:%d bits:%d %s\n", | av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d ilv:%d bits:%d %s\n", | |||
s->lossless ? "lossless" : "sequential DCT", s->rgb ? "RGB" : "", | s->lossless ? "lossless" : "sequential DCT", s->rgb ? "RGB" : "", | |||
predictor, point_transform, ilv, s->bits, | predictor, point_transform, ilv, s->bits, | |||
s->pegasus_rct ? "PRCT" : (s->rct ? "RCT" : "")); | s->pegasus_rct ? "PRCT" : (s->rct ? "RCT" : "")); | |||
/* mjpeg-b can have padding bytes between sos and image data, skip them */ | /* mjpeg-b can have padding bytes between sos and image data, skip them */ | |||
for (i = s->mjpb_skiptosod; i > 0; i--) | for (i = s->mjpb_skiptosod; i > 0; i--) | |||
skip_bits(&s->gb, 8); | skip_bits(&s->gb, 8); | |||
if (s->lossless && s->rgb && nb_components != 3) { | ||||
avpriv_request_sample(s->avctx, | ||||
"Lossless RGB image without 3 components"); | ||||
return AVERROR_PATCHWELCOME; | ||||
} | ||||
next_field: | next_field: | |||
for (i = 0; i < nb_components; i++) | for (i = 0; i < nb_components; i++) | |||
s->last_dc[i] = 1024; | s->last_dc[i] = 1024; | |||
if (s->lossless) { | if (s->lossless) { | |||
if (CONFIG_JPEGLS_DECODER && s->ls) { | if (CONFIG_JPEGLS_DECODER && s->ls) { | |||
// for () { | // for () { | |||
// reset_ls_coding_parameters(s, 0); | // reset_ls_coding_parameters(s, 0); | |||
if ((ret = ff_jpegls_decode_picture(s, predictor, | if ((ret = ff_jpegls_decode_picture(s, predictor, | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 6 lines changed or added |