summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-10-21 22:44:47 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-10-21 22:44:47 +0000
commite4463f21eed164413d9bb8904d0a78ce6d7fdb72 (patch)
treed8b68c5e3248fb15e4c058ed3766f59d388c3369 /libavcodec/mjpegdec.c
parent2111a191ebec422cf7781225cbcfdd69e71afce1 (diff)
Simplify last coeff check in mjpeg decode_block()
Originally committed as revision 25547 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ce52a08e83..242d0208e4 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -432,12 +432,7 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
LAST_SKIP_BITS(re, &s->gb, code)
- if (i >= 63) {
- if(i == 63){
- j = s->scantable.permutated[63];
- block[j] = level * quant_matrix[j];
- break;
- }
+ if (i > 63) {
av_log(s->avctx, AV_LOG_ERROR, "error count: %d\n", i);
return -1;
}