[SCM] libav/experimental: vp3: Factor out expression
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:23:13 UTC 2013
The following commit has been merged in the experimental branch:
commit e8dcd730583a0aa69c33a17fc27d65fa55f5effe
Author: Alexander Strange <astrange at ithinksw.com>
Date: Sat Feb 5 00:28:27 2011 -0500
vp3: Factor out expression
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 06f55f6..292a4ef 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -1345,7 +1345,7 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y)
*/
static void render_slice(Vp3DecodeContext *s, int slice)
{
- int x, y, i, j;
+ int x, y, i, j, fragment;
LOCAL_ALIGNED_16(DCTELEM, block, [64]);
int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef;
int motion_halfpel_index;
@@ -1390,8 +1390,9 @@ static void render_slice(Vp3DecodeContext *s, int slice)
for (j = 0; j < 16; j++) {
x = 4*sb_x + hilbert_offset[j][0];
y = 4*sb_y + hilbert_offset[j][1];
+ fragment = y*fragment_width + x;
- i = fragment_start + y*fragment_width + x;
+ i = fragment_start + fragment;
// bounds check
if (x >= fragment_width || y >= fragment_height)
@@ -1415,8 +1416,8 @@ static void render_slice(Vp3DecodeContext *s, int slice)
if ((s->all_fragments[i].coding_method > MODE_INTRA) &&
(s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
int src_x, src_y;
- motion_x = motion_val[y*fragment_width + x][0];
- motion_y = motion_val[y*fragment_width + x][1];
+ motion_x = motion_val[fragment][0];
+ motion_y = motion_val[fragment][1];
src_x= (motion_x>>1) + 8*x;
src_y= (motion_y>>1) + 8*y;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list