On Fri, May 17, 2013 at 01:26:59PM +0200, Luca Barbato wrote:
> ---
> libavcodec/jpeglsdec.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
> index 8eacf04..9d946fa 100644
> --- a/libavcodec/jpeglsdec.c
> +++ b/libavcodec/jpeglsdec.c
> @@ -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 = {
> --
LGTM
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
