diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 02:59:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 02:59:33 +0200 |
| commit | 1e4e0bd907ebf4e69af84276f789f304f52a280f (patch) | |
| tree | 3dde46b9d859613840e33016e987be62ae41ea46 /libavcodec | |
| parent | 7ac6c6325e0312f3c70819010a50cd97b01802b7 (diff) | |
avcodec/mjpegdec: change error return value to be outside the 16bit range
Fixes part of Ticket2965
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 470ff8d69b..266254ca35 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -524,7 +524,7 @@ static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) av_log(s->avctx, AV_LOG_WARNING, "mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index, &s->vlcs[0][dc_index]); - return 0xffff; + return 0xfffff; } if (code) @@ -541,7 +541,7 @@ static int decode_block(MJpegDecodeContext *s, int16_t *block, int component, /* DC coef */ val = mjpeg_decode_dc(s, dc_index); - if (val == 0xffff) { + if (val == 0xfffff) { av_log(s->avctx, AV_LOG_ERROR, "error dc\n"); return AVERROR_INVALIDDATA; } @@ -589,7 +589,7 @@ static int decode_dc_progressive(MJpegDecodeContext *s, int16_t *block, int val; s->dsp.clear_block(block); val = mjpeg_decode_dc(s, dc_index); - if (val == 0xffff) { + if (val == 0xfffff) { av_log(s->avctx, AV_LOG_ERROR, "error dc\n"); return AVERROR_INVALIDDATA; } @@ -853,7 +853,7 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); dc = mjpeg_decode_dc(s, s->dc_index[i]); - if(dc == 0xFFFF) + if(dc == 0xFFFFF) return -1; left[i] = buffer[mb_x][i] = @@ -944,7 +944,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int pred, dc; dc = mjpeg_decode_dc(s, s->dc_index[i]); - if(dc == 0xFFFF) + if(dc == 0xFFFFF) return -1; if(bits<=8){ ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap @@ -1012,7 +1012,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int pred; dc = mjpeg_decode_dc(s, s->dc_index[i]); - if(dc == 0xFFFF) + if(dc == 0xFFFFF) return -1; if(bits<=8){ ptr = s->picture.data[c] + |