From a7d70d88df96756896171c9acefca24b7a876c3c Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Mon, 24 Sep 2007 20:52:11 +0000
Subject: [PATCH] rename vp56_b6to3 to vp56_b2p
Originally committed as revision 10569 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/vp56.c | 10 +++++-----
libavcodec/vp56data.c | 2 +-
libavcodec/vp56data.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index 32db5ba50f1..0858e840281 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -285,12 +285,12 @@ static void vp56_add_predictors_dc(vp56_context_t *s, vp56_frame_t ref_frame)
}
}
if (count == 0)
- dc = s->prev_dc[vp56_b6to3[i]][ref_frame];
+ dc = s->prev_dc[vp56_b2p[i]][ref_frame];
else if (count == 2)
dc /= 2;
s->block_coeff[i][idx] += dc;
- s->prev_dc[vp56_b6to3[i]][ref_frame] = s->block_coeff[i][idx];
+ s->prev_dc[vp56_b2p[i]][ref_frame] = s->block_coeff[i][idx];
ab->dc_coeff = s->block_coeff[i][idx];
ab->ref_frame = ref_frame;
lb->dc_coeff = s->block_coeff[i][idx];
@@ -417,7 +417,7 @@ static void vp56_decode_mb(vp56_context_t *s, int row, int col)
switch (mb_type) {
case VP56_MB_INTRA:
for (b=0; b<6; b++) {
- plan = vp56_b6to3[b];
+ plan = vp56_b2p[b];
s->dsp.idct_put(frame_current->data[plan] + s->block_offset[b],
s->stride[plan], s->block_coeff[b]);
}
@@ -426,7 +426,7 @@ static void vp56_decode_mb(vp56_context_t *s, int row, int col)
case VP56_MB_INTER_NOVEC_PF:
case VP56_MB_INTER_NOVEC_GF:
for (b=0; b<6; b++) {
- plan = vp56_b6to3[b];
+ plan = vp56_b2p[b];
off = s->block_offset[b];
s->dsp.put_pixels_tab[1][0](frame_current->data[plan] + off,
frame_ref->data[plan] + off,
@@ -446,7 +446,7 @@ static void vp56_decode_mb(vp56_context_t *s, int row, int col)
for (b=0; b<6; b++) {
int x_off = b==1 || b==3 ? 8 : 0;
int y_off = b==2 || b==3 ? 8 : 0;
- plan = vp56_b6to3[b];
+ plan = vp56_b2p[b];
vp56_mc(s, b, plan, frame_ref->data[plan], s->stride[plan],
16*col+x_off, 16*row+y_off);
s->dsp.idct_add(frame_current->data[plan] + s->block_offset[b],
diff --git a/libavcodec/vp56data.c b/libavcodec/vp56data.c
index 6ef3abb36af..3510eac5868 100644
--- a/libavcodec/vp56data.c
+++ b/libavcodec/vp56data.c
@@ -23,7 +23,7 @@
#include "vp56data.h"
-const uint8_t vp56_b6to3[] = { 0, 0, 0, 0, 1, 2 };
+const uint8_t vp56_b2p[] = { 0, 0, 0, 0, 1, 2 };
const uint8_t vp56_b6to4[] = { 0, 0, 1, 1, 2, 3 };
const uint8_t vp56_coeff_parse_table[6][11] = {
diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h
index 51e6983119b..4fcdcc18f89 100644
--- a/libavcodec/vp56data.h
+++ b/libavcodec/vp56data.h
@@ -51,7 +51,7 @@ typedef struct {
int8_t prob_idx;
} vp56_tree_t;
-extern const uint8_t vp56_b6to3[];
+extern const uint8_t vp56_b2p[];
extern const uint8_t vp56_b6to4[];
extern const uint8_t vp56_coeff_parse_table[6][11];
extern const uint8_t vp56_def_mb_types_stats[3][10][2];
--
GitLab