In that patch:

- avctx and gb elements were removed from VC9Context, hence a larger diff
- some code was added to h263dec.c regarding CODEC_ID_WMV3 (should apply to CODEC_ID_VC9 too)
- VLC tables and other related tables were made global whenever this seemed necessary; appropriate changes were therefore made to other parts of the code using those tables
- the change for the bitplane management to a struct (some of them should eventually be mapped to MpegEncContext arrays) wasn't associated with the proper frees; should be fixed now
patch by anonymous

better names for globalized tables by me

Originally committed as revision 3905 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 2 insertions, 17 deletions

diff --git a/libavcodec/vc9data.h b/libavcodec/vc9data.h
index f959cffed3..90c68a383d 100644
--- a/libavcodec/vc9data.h
+++ b/libavcodec/vc9data.h
@@ -167,23 +167,8 @@ static const uint8_t vc9_4mv_block_pattern_bits[4][16] = {
   { 2, 4, 4, 4, 4, 4, 5, 5, 4, 5, 4, 5, 4, 5, 5, 4}
 };
 
-/* I-Picture CBPCY VLC tables */
-//same as msmpeg4 table_mb_intra
-static const uint16_t vc9_cbpcy_i_codes[64] = {
-     1,   23,    9,    5,    6,   71,   32,   16,
-     2,  124,   58,   29,    2,  236,  119,    0,
-     3,  183,   44,   19,    1,  360,   70,   63,
-    30, 1810,  181,   66,   34,  453,  286,  135,
-     6,    3,   30,   28,   18,  904,   68,  112,
-    31,  574,   57,  142,    1,  454,  182,   69,
-    20,  575,  125,   24,    7,  455,  134,   25,
-    21,  475,    2,   70,   13, 1811,  474,  361
-};
-static const uint8_t vc9_cbpcy_i_bits[64] = {
-   1,  6,  5,  5,  5,  9,  7,  7,  5,  9,  7,  7,  6,  9,  8,  8,
-   5,  9,  7,  7,  6, 10,  8,  8,  6, 13,  9,  8,  7, 11, 10,  9,
-   4,  9,  7,  6,  7, 12,  9,  9,  6, 11,  8,  9,  7, 11,  9,  9,
-   6, 11,  9,  9,  7, 11,  9,  9,  6, 10,  9,  9,  8, 13, 10, 10
+const uint8_t wmv3_dc_scale_table[32]={
+    0, 4, 6, 8, 8, 8, 9, 9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21
 };
 
 /* P-Picture CBPCY VLC tables */