Split H263 encoder and decoder from common code.

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

1 files changed, 7 insertions, 43 deletions

diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index 0553ca701c..ab5d5b339d 100644
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -57,7 +57,7 @@ const uint8_t ff_h263_inter_MCBPC_bits[28] = {
     11, 13, 13, 13,/* inter4Q*/
 };
 
-static const uint8_t h263_mbtype_b_tab[15][2] = {
+const uint8_t h263_mbtype_b_tab[15][2] = {
  {1, 1},
  {3, 3},
  {1, 5},
@@ -75,25 +75,7 @@ static const uint8_t h263_mbtype_b_tab[15][2] = {
  {1, 8},
 };
 
-static const int h263_mb_type_b_map[15]= {
-    MB_TYPE_DIRECT2 | MB_TYPE_L0L1,
-    MB_TYPE_DIRECT2 | MB_TYPE_L0L1 | MB_TYPE_CBP,
-    MB_TYPE_DIRECT2 | MB_TYPE_L0L1 | MB_TYPE_CBP | MB_TYPE_QUANT,
-                      MB_TYPE_L0                                 | MB_TYPE_16x16,
-                      MB_TYPE_L0   | MB_TYPE_CBP                 | MB_TYPE_16x16,
-                      MB_TYPE_L0   | MB_TYPE_CBP | MB_TYPE_QUANT | MB_TYPE_16x16,
-                      MB_TYPE_L1                                 | MB_TYPE_16x16,
-                      MB_TYPE_L1   | MB_TYPE_CBP                 | MB_TYPE_16x16,
-                      MB_TYPE_L1   | MB_TYPE_CBP | MB_TYPE_QUANT | MB_TYPE_16x16,
-                      MB_TYPE_L0L1                               | MB_TYPE_16x16,
-                      MB_TYPE_L0L1 | MB_TYPE_CBP                 | MB_TYPE_16x16,
-                      MB_TYPE_L0L1 | MB_TYPE_CBP | MB_TYPE_QUANT | MB_TYPE_16x16,
-    0, //stuffing
-    MB_TYPE_INTRA4x4                | MB_TYPE_CBP,
-    MB_TYPE_INTRA4x4                | MB_TYPE_CBP | MB_TYPE_QUANT,
-};
-
-static const uint8_t cbpc_b_tab[4][2] = {
+const uint8_t cbpc_b_tab[4][2] = {
 {0, 1},
 {2, 2},
 {7, 3},
@@ -246,7 +228,7 @@ static const int8_t intra_level_aic[102] = {
  1,  1,  1,  1,  1,  1,
 };
 
-static RLTable rl_intra_aic = {
+RLTable rl_intra_aic = {
     102,
     58,
     intra_vlc_aic,
@@ -254,25 +236,7 @@ static RLTable rl_intra_aic = {
     intra_level_aic,
 };
 
-#if CONFIG_ENCODERS
-static const uint8_t wrong_run[102] = {
- 1,  2,  3,  5,  4, 10,  9,  8,
-11, 15, 17, 16, 23, 22, 21, 20,
-19, 18, 25, 24, 27, 26, 11,  7,
- 6,  1,  2, 13,  2,  2,  2,  2,
- 6, 12,  3,  9,  1,  3,  4,  3,
- 7,  4,  1,  1,  5,  5, 14,  6,
- 1,  7,  1,  8,  1,  1,  1,  1,
-10,  1,  1,  5,  9, 17, 25, 24,
-29, 33, 32, 41,  2, 23, 28, 31,
- 3, 22, 30,  4, 27, 40,  8, 26,
- 6, 39,  7, 38, 16, 37, 15, 10,
-11, 12, 13, 14,  1, 21, 20, 18,
-19,  2,  1, 34, 35, 36
-};
-#endif
-
-static const uint16_t h263_format[8][2] = {
+const uint16_t h263_format[8][2] = {
     { 0, 0 },
     { 128, 96 },
     { 176, 144 },
@@ -286,7 +250,7 @@ const uint8_t ff_aic_dc_scale_table[32]={
     0, 2, 4, 6, 8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62
 };
 
-static const uint8_t modified_quant_tab[2][32]={
+const uint8_t modified_quant_tab[2][32]={
 //  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
 {
     0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9,10,11,12,13,14,15,16,17,18,18,19,20,21,22,23,24,25,26,27,28
@@ -300,11 +264,11 @@ const uint8_t ff_h263_chroma_qscale_table[32]={
     0, 1, 2, 3, 4, 5, 6, 6, 7, 8, 9, 9,10,10,11,11,12,12,12,13,13,13,14,14,14,14,14,15,15,15,15,15
 };
 
-const uint16_t ff_mba_max[6]={
+uint16_t ff_mba_max[6]={
      47,  98, 395,1583,6335,9215
 };
 
-const uint8_t ff_mba_length[7]={
+uint8_t ff_mba_length[7]={
       6,   7,   9,  11,  13,  14,  14
 };