From 2a00812d82c5f8a76328597c8b5ee1d4cd9c49dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 31 Aug 2014 20:30:04 +0200 Subject: h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 3646 -> 3597 decicycles in inner loop when decoding vsynth1-flv. Signed-off-by: Reimar Döffinger --- libavcodec/h261dec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libavcodec/h261dec.c') diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index f286d23..c9470b1 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -305,6 +305,7 @@ static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded) } { OPEN_READER(re, &s->gb); + i--; // offset by -1 to allow direct indexing of scan_table for (;;) { UPDATE_CACHE(re, &s->gb); GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TCOEFF_VLC_BITS, 2, 0); @@ -330,17 +331,17 @@ static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded) SKIP_COUNTER(re, &s->gb, 1); } i += run; - if (i > 64) { + if (i >= 64) { av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n", s->mb_x, s->mb_y); return -1; } - j = scan_table[i-1]; + j = scan_table[i]; block[j] = level; } CLOSE_READER(re, &s->gb); } - s->block_last_index[n] = i - 1; + s->block_last_index[n] = i; return 0; } -- cgit v1.1