aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp56.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-09-25 21:01:34 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-09-25 21:01:34 +0000
commit442b145abb0cd64813359280d38b0bd30cdcea27 (patch)
tree29e35703c7a23ef907c363e8a5bb31850a6aa462 /libavcodec/vp56.c
parent172d1171d2ae2bda29c3060f7390293cb3a0b2d1 (diff)
downloadffmpeg-442b145abb0cd64813359280d38b0bd30cdcea27.tar.gz
consistent spelling: plan => plane
Originally committed as revision 10582 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp56.c')
-rw-r--r--libavcodec/vp56.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index 7f28ed0f7a..27b77beb3c 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -400,7 +400,7 @@ static void vp56_decode_mb(vp56_context_t *s, int row, int col, int is_alpha)
AVFrame *frame_current, *frame_ref;
vp56_mb_t mb_type;
vp56_frame_t ref_frame;
- int b, ab, b_max, plan, off;
+ int b, ab, b_max, plane, off;
if (s->framep[VP56_FRAME_CURRENT]->key_frame)
mb_type = VP56_MB_INTRA;
@@ -423,22 +423,22 @@ static void vp56_decode_mb(vp56_context_t *s, int row, int col, int is_alpha)
switch (mb_type) {
case VP56_MB_INTRA:
for (b=0; b<b_max; b++) {
- plan = vp56_b2p[b+ab];
- s->dsp.idct_put(frame_current->data[plan] + s->block_offset[b],
- s->stride[plan], s->block_coeff[b]);
+ plane = vp56_b2p[b+ab];
+ s->dsp.idct_put(frame_current->data[plane] + s->block_offset[b],
+ s->stride[plane], s->block_coeff[b]);
}
break;
case VP56_MB_INTER_NOVEC_PF:
case VP56_MB_INTER_NOVEC_GF:
for (b=0; b<b_max; b++) {
- plan = vp56_b2p[b+ab];
+ plane = vp56_b2p[b+ab];
off = s->block_offset[b];
- s->dsp.put_pixels_tab[1][0](frame_current->data[plan] + off,
- frame_ref->data[plan] + off,
- s->stride[plan], 8);
- s->dsp.idct_add(frame_current->data[plan] + off,
- s->stride[plan], s->block_coeff[b]);
+ s->dsp.put_pixels_tab[1][0](frame_current->data[plane] + off,
+ frame_ref->data[plane] + off,
+ s->stride[plane], 8);
+ s->dsp.idct_add(frame_current->data[plane] + off,
+ s->stride[plane], s->block_coeff[b]);
}
break;
@@ -452,11 +452,11 @@ static void vp56_decode_mb(vp56_context_t *s, int row, int col, int is_alpha)
for (b=0; b<b_max; b++) {
int x_off = b==1 || b==3 ? 8 : 0;
int y_off = b==2 || b==3 ? 8 : 0;
- plan = vp56_b2p[b+ab];
- vp56_mc(s, b, plan, frame_ref->data[plan], s->stride[plan],
+ plane = vp56_b2p[b+ab];
+ vp56_mc(s, b, plane, frame_ref->data[plane], s->stride[plane],
16*col+x_off, 16*row+y_off);
- s->dsp.idct_add(frame_current->data[plan] + s->block_offset[b],
- s->stride[plan], s->block_coeff[b]);
+ s->dsp.idct_add(frame_current->data[plane] + s->block_offset[b],
+ s->stride[plane], s->block_coeff[b]);
}
break;
}