From 3e7233688a3f62c1bf77251d47d56f49500b80c7 Mon Sep 17 00:00:00 2001
From: Stefan Gehrer <stefan.gehrer@gmx.de>
Date: Sat, 24 Jan 2009 14:28:08 +0000
Subject: [PATCH] avoid duplication of size_table and offset_table
Originally committed as revision 16743 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/vc1.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 3e33a1b8a91..c2c2931aa04 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -3103,6 +3103,8 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquan
return pat;
}
+static const int size_table [6] = { 0, 2, 3, 4, 5, 8 };
+static const int offset_table[6] = { 0, 1, 3, 7, 15, 31 };
/** Decode one P-frame MB (in Simple/Main profile)
*/
@@ -3116,8 +3118,6 @@ static int vc1_decode_p_mb(VC1Context *v)
int mqdiff, mquant; /* MB quantization */
int ttmb = v->ttfrm; /* MB Transform type */
- static const int size_table[6] = { 0, 2, 3, 4, 5, 8 },
- offset_table[6] = { 0, 1, 3, 7, 15, 31 };
int mb_has_coeffs = 1; /* last_flag */
int dmv_x, dmv_y; /* Differential MV components */
int index, index1; /* LUT indexes */
@@ -3411,9 +3411,6 @@ static void vc1_decode_b_mb(VC1Context *v)
int cbp = 0; /* cbp decoding stuff */
int mqdiff, mquant; /* MB quantization */
int ttmb = v->ttfrm; /* MB Transform type */
-
- static const int size_table[6] = { 0, 2, 3, 4, 5, 8 },
- offset_table[6] = { 0, 1, 3, 7, 15, 31 };
int mb_has_coeffs = 0; /* last_flag */
int index, index1; /* LUT indexes */
int val, sign; /* temp values */
--
GitLab