diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 20:13:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 20:16:49 +0100 |
| commit | 1c16483cc0dabd298eb3a195724a4bcd4787b8d0 (patch) | |
| tree | a1232ceedb576e66de7a7d69faf3d8fcd6f4307c /libavcodec/mjpegdec.c | |
| parent | de9fc0e9d67e02172c2345d6dc6f31629c95f37a (diff) | |
| download | ffmpeg-1c16483cc0dabd298eb3a195724a4bcd4787b8d0.tar.gz | |
mjpegdec: replace returns by goto fail in frame decode.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 217464e82c..0571d1fe83 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1651,7 +1651,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, case DHT: if ((ret = ff_mjpeg_decode_dht(s)) < 0) { av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n"); - return ret; + goto fail; } break; case SOF0: @@ -1660,33 +1660,33 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, s->ls = 0; s->progressive = 0; if ((ret = ff_mjpeg_decode_sof(s)) < 0) - return ret; + goto fail; break; case SOF2: s->lossless = 0; s->ls = 0; s->progressive = 1; if ((ret = ff_mjpeg_decode_sof(s)) < 0) - return ret; + goto fail; break; case SOF3: s->lossless = 1; s->ls = 0; s->progressive = 0; if ((ret = ff_mjpeg_decode_sof(s)) < 0) - return ret; + goto fail; break; case SOF48: s->lossless = 1; s->ls = 1; s->progressive = 0; if ((ret = ff_mjpeg_decode_sof(s)) < 0) - return ret; + goto fail; break; case LSE: if (!CONFIG_JPEGLS_DECODER || (ret = ff_jpegls_decode_lse(s)) < 0) - return ret; + goto fail; break; case EOI: eoi_parser: @@ -1723,7 +1723,7 @@ eoi_parser: case SOS: if ((ret = ff_mjpeg_decode_sos(s, NULL, NULL)) < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) - return ret; + goto fail; break; case DRI: mjpeg_decode_dri(s); @@ -1756,6 +1756,8 @@ eoi_parser: } av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n"); return AVERROR_INVALIDDATA; +fail: + return ret; the_end: if (s->upscale_h) { uint8_t *line = s->picture_ptr->data[s->upscale_h]; |