[SCM] libav/experimental: Simplify last coeff check in mjpeg decode_block()
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:18:00 UTC 2013
The following commit has been merged in the experimental branch:
commit e4463f21eed164413d9bb8904d0a78ce6d7fdb72
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Oct 21 22:44:47 2010 +0000
Simplify last coeff check in mjpeg decode_block()
Originally committed as revision 25547 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ce52a08..242d020 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;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list