mirror of https://git.ffmpeg.org/ffmpeg.git
jpegls: factorize return paths
This commit is contained in:
parent
a5a0ef5e13
commit
4a4107b489
|
@ -274,7 +274,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
|
|||
int i, t = 0;
|
||||
uint8_t *zero, *last, *cur;
|
||||
JLSState *state;
|
||||
int off = 0, stride = 1, width, shift;
|
||||
int off = 0, stride = 1, width, shift, ret = 0;
|
||||
|
||||
zero = av_mallocz(s->picture_ptr->linesize[0]);
|
||||
last = zero;
|
||||
|
@ -347,9 +347,8 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
|
|||
}
|
||||
} else if (ilv == 2) { /* sample interleaving */
|
||||
avpriv_report_missing_feature(s->avctx, "Sample interleaved images");
|
||||
av_free(state);
|
||||
av_free(zero);
|
||||
return AVERROR_PATCHWELCOME;
|
||||
ret = AVERROR_PATCHWELCOME;
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (shift) { /* we need to do point transform or normalize samples */
|
||||
|
@ -375,10 +374,12 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
end:
|
||||
av_free(state);
|
||||
av_free(zero);
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
AVCodec ff_jpegls_decoder = {
|
||||
|
|
Loading…
Reference in New Issue