virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mjpegdec: replace returns by goto fail in frame decode.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-27 20:13:18 +01:00
parent de9fc0e9d6
commit 1c16483cc0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/mjpegdec.c
View File

@ -1651,7 +1651,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
case DHT: case DHT:
if ((ret = ff_mjpeg_decode_dht(s)) < 0) { if ((ret = ff_mjpeg_decode_dht(s)) < 0) {
av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n"); av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n");
return ret; goto fail;
} }
break; break;
case SOF0: case SOF0:
@ -1660,33 +1660,33 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
s->ls = 0; s->ls = 0;
s->progressive = 0; s->progressive = 0;
if ((ret = ff_mjpeg_decode_sof(s)) < 0) if ((ret = ff_mjpeg_decode_sof(s)) < 0)
return ret; goto fail;
break; break;
case SOF2: case SOF2:
s->lossless = 0; s->lossless = 0;
s->ls = 0; s->ls = 0;
s->progressive = 1; s->progressive = 1;
if ((ret = ff_mjpeg_decode_sof(s)) < 0) if ((ret = ff_mjpeg_decode_sof(s)) < 0)
return ret; goto fail;
break; break;
case SOF3: case SOF3:
s->lossless = 1; s->lossless = 1;
s->ls = 0; s->ls = 0;
s->progressive = 0; s->progressive = 0;
if ((ret = ff_mjpeg_decode_sof(s)) < 0) if ((ret = ff_mjpeg_decode_sof(s)) < 0)
return ret; goto fail;
break; break;
case SOF48: case SOF48:
s->lossless = 1; s->lossless = 1;
s->ls = 1; s->ls = 1;
s->progressive = 0; s->progressive = 0;
if ((ret = ff_mjpeg_decode_sof(s)) < 0) if ((ret = ff_mjpeg_decode_sof(s)) < 0)
return ret; goto fail;
break; break;
case LSE: case LSE:
if (!CONFIG_JPEGLS_DECODER || if (!CONFIG_JPEGLS_DECODER ||
(ret = ff_jpegls_decode_lse(s)) < 0) (ret = ff_jpegls_decode_lse(s)) < 0)
return ret; goto fail;
break; break;
case EOI: case EOI:
eoi_parser: eoi_parser:
@ -1723,7 +1723,7 @@ eoi_parser:
case SOS: case SOS:
if ((ret = ff_mjpeg_decode_sos(s, NULL, NULL)) < 0 && if ((ret = ff_mjpeg_decode_sos(s, NULL, NULL)) < 0 &&
(avctx->err_recognition & AV_EF_EXPLODE)) (avctx->err_recognition & AV_EF_EXPLODE))
return ret; goto fail;
break; break;
case DRI: case DRI:
mjpeg_decode_dri(s); mjpeg_decode_dri(s);
@ -1756,6 +1756,8 @@ eoi_parser:
} }
av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n"); av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
fail:
return ret;
the_end: the_end:
if (s->upscale_h) { if (s->upscale_h) {
uint8_t *line = s->picture_ptr->data[s->upscale_h]; uint8_t *line = s->picture_ptr->data[s->upscale_h];