diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 63405c4b6e..89a1527219 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1288,27 +1288,27 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data, return -1; } if (ret = jpeg2000_read_main_headers(s)) - goto fail; + goto end; /* get picture buffer */ if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed.\n"); - goto fail; + goto end; } picture->pict_type = AV_PICTURE_TYPE_I; picture->key_frame = 1; if (ret = jpeg2000_read_bitstream_packets(s)) - goto fail; + goto end; for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture)) - goto fail; + goto end; jpeg2000_dec_cleanup(s); *got_frame = 1; return s->buf - s->buf_start; -fail: +end: jpeg2000_dec_cleanup(s); return ret; }