[3/4] h263: Give an avpriv prefix to some VLC tables

Message ID 1330005641-19309-3-git-send-email-martin@martin.st
State Superseded
Headers show

Commit Message

Martin Storsjö Feb. 23, 2012, 2 p.m.
---
 libavcodec/h263.h          |   20 ++++++++++----------
 libavcodec/h263data.h      |   24 ++++++++++++------------
 libavcodec/ituh263dec.c    |   16 ++++++++--------
 libavcodec/ituh263enc.c    |   32 ++++++++++++++++----------------
 libavcodec/mpeg4videoenc.c |   28 ++++++++++++++--------------
 libavcodec/msmpeg4.c       |   16 ++++++++--------
 libavcodec/msmpeg4data.c   |   12 ++++++------
 libavcodec/svq1dec.c       |    6 +++---
 8 files changed, 77 insertions(+), 77 deletions(-)

Patch

diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index d26cf63..5733b8a 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -36,17 +36,17 @@ 
 #define TEX_VLC_BITS 9
 
 extern const AVRational ff_h263_pixel_aspect[16];
-extern const uint8_t ff_h263_cbpy_tab[16][2];
+extern const uint8_t avpriv_h263_cbpy_tab[16][2];
 
 extern const uint8_t ff_cbpc_b_tab[4][2];
 
-extern const uint8_t ff_mvtab[33][2];
+extern const uint8_t avpriv_mvtab[33][2];
 
-extern const uint8_t ff_h263_intra_MCBPC_code[9];
-extern const uint8_t ff_h263_intra_MCBPC_bits[9];
+extern const uint8_t avpriv_h263_intra_MCBPC_code[9];
+extern const uint8_t avpriv_h263_intra_MCBPC_bits[9];
 
-extern const uint8_t ff_h263_inter_MCBPC_code[28];
-extern const uint8_t ff_h263_inter_MCBPC_bits[28];
+extern const uint8_t avpriv_h263_inter_MCBPC_code[28];
+extern const uint8_t avpriv_h263_inter_MCBPC_bits[28];
 extern const uint8_t ff_h263_mbtype_b_tab[15][2];
 
 extern VLC ff_h263_intra_MCBPC_vlc;
@@ -119,7 +119,7 @@  static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code
     int l, bit_size, code;
 
     if (val == 0) {
-        return ff_mvtab[0][1];
+        return avpriv_mvtab[0][1];
     } else {
         bit_size = f_code - 1;
         /* modulo encoding */
@@ -128,7 +128,7 @@  static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code
         val--;
         code = (val >> bit_size) + 1;
 
-        return ff_mvtab[code][1] + 1 + bit_size;
+        return avpriv_mvtab[code][1] + 1 + bit_size;
     }
 }
 
@@ -156,7 +156,7 @@  static inline int get_p_cbp(MpegEncContext * s,
         const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
 
         for(i=0; i<4; i++){
-            int score= ff_h263_inter_MCBPC_bits[i + offset] * lambda;
+            int score= avpriv_h263_inter_MCBPC_bits[i + offset] * lambda;
             if(i&1) score += s->coded_score[5];
             if(i&2) score += s->coded_score[4];
 
@@ -167,7 +167,7 @@  static inline int get_p_cbp(MpegEncContext * s,
         }
 
         for(i=0; i<16; i++){
-            int score= ff_h263_cbpy_tab[i ^ 0xF][1] * lambda;
+            int score= avpriv_h263_cbpy_tab[i ^ 0xF][1] * lambda;
             if(i&1) score += s->coded_score[3];
             if(i&2) score += s->coded_score[2];
             if(i&4) score += s->coded_score[1];
diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index e3b83ad..eeeed40 100644
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -33,12 +33,12 @@ 
 #include "mpegvideo.h"
 
 /* intra MCBPC, mb_type = (intra), then (intraq) */
-const uint8_t ff_h263_intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 };
-const uint8_t ff_h263_intra_MCBPC_bits[9] = { 1, 3, 3, 3, 4, 6, 6, 6, 9 };
+const uint8_t avpriv_h263_intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 };
+const uint8_t avpriv_h263_intra_MCBPC_bits[9] = { 1, 3, 3, 3, 4, 6, 6, 6, 9 };
 
 /* inter MCBPC, mb_type = (inter), (intra), (interq), (intraq), (inter4v) */
 /* Changed the tables for interq and inter4v+q, following the standard ** Juanjo ** */
-const uint8_t ff_h263_inter_MCBPC_code[28] = {
+const uint8_t avpriv_h263_inter_MCBPC_code[28] = {
     1, 3, 2, 5,
     3, 4, 3, 3,
     3, 7, 6, 5,
@@ -47,7 +47,7 @@  const uint8_t ff_h263_inter_MCBPC_code[28] = {
     1, 0, 0, 0, /* Stuffing */
     2, 12, 14, 15,
 };
-const uint8_t ff_h263_inter_MCBPC_bits[28] = {
+const uint8_t avpriv_h263_inter_MCBPC_bits[28] = {
     1, 4, 4, 6, /* inter  */
     5, 8, 8, 7, /* intra  */
     3, 7, 7, 9, /* interQ */
@@ -82,13 +82,13 @@  const uint8_t ff_cbpc_b_tab[4][2] = {
 {6, 3},
 };
 
-const uint8_t ff_h263_cbpy_tab[16][2] =
+const uint8_t avpriv_h263_cbpy_tab[16][2] =
 {
   {3,4}, {5,5}, {4,5}, {9,4}, {3,5}, {7,4}, {2,6}, {11,4},
   {2,5}, {3,6}, {5,4}, {10,4}, {4,4}, {8,4}, {6,4}, {3,2}
 };
 
-const uint8_t ff_mvtab[33][2] =
+const uint8_t avpriv_mvtab[33][2] =
 {
   {1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7},
   {11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10},
@@ -98,7 +98,7 @@  const uint8_t ff_mvtab[33][2] =
 };
 
 /* third non intra table */
-const uint16_t ff_inter_vlc[103][2] = {
+const uint16_t avpriv_inter_vlc[103][2] = {
 { 0x2, 2 },{ 0xf, 4 },{ 0x15, 6 },{ 0x17, 7 },
 { 0x1f, 8 },{ 0x25, 9 },{ 0x24, 9 },{ 0x21, 10 },
 { 0x20, 10 },{ 0x7, 11 },{ 0x6, 11 },{ 0x20, 11 },
@@ -127,7 +127,7 @@  const uint16_t ff_inter_vlc[103][2] = {
 { 0x5e, 12 },{ 0x5f, 12 },{ 0x3, 7 },
 };
 
-const int8_t ff_inter_level[102] = {
+const int8_t avpriv_inter_level[102] = {
   1,  2,  3,  4,  5,  6,  7,  8,
   9, 10, 11, 12,  1,  2,  3,  4,
   5,  6,  1,  2,  3,  4,  1,  2,
@@ -143,7 +143,7 @@  const int8_t ff_inter_level[102] = {
   1,  1,  1,  1,  1,  1,
 };
 
-const int8_t ff_inter_run[102] = {
+const int8_t avpriv_inter_run[102] = {
   0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  1,  1,  1,  1,
   1,  1,  2,  2,  2,  2,  3,  3,
@@ -162,9 +162,9 @@  const int8_t ff_inter_run[102] = {
 RLTable ff_h263_rl_inter = {
     102,
     58,
-    ff_inter_vlc,
-    ff_inter_run,
-    ff_inter_level,
+    avpriv_inter_vlc,
+    avpriv_inter_run,
+    avpriv_inter_level,
 };
 
 static const uint16_t intra_vlc_aic[103][2] = {
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index c2ee752..b159c04 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -109,17 +109,17 @@  void ff_h263_decode_init_vlc(MpegEncContext *s)
         done = 1;
 
         INIT_VLC_STATIC(&ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9,
-                 ff_h263_intra_MCBPC_bits, 1, 1,
-                 ff_h263_intra_MCBPC_code, 1, 1, 72);
+                 avpriv_h263_intra_MCBPC_bits, 1, 1,
+                 avpriv_h263_intra_MCBPC_code, 1, 1, 72);
         INIT_VLC_STATIC(&ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 28,
-                 ff_h263_inter_MCBPC_bits, 1, 1,
-                 ff_h263_inter_MCBPC_code, 1, 1, 198);
+                 avpriv_h263_inter_MCBPC_bits, 1, 1,
+                 avpriv_h263_inter_MCBPC_code, 1, 1, 198);
         INIT_VLC_STATIC(&ff_h263_cbpy_vlc, CBPY_VLC_BITS, 16,
-                 &ff_h263_cbpy_tab[0][1], 2, 1,
-                 &ff_h263_cbpy_tab[0][0], 2, 1, 64);
+                 &avpriv_h263_cbpy_tab[0][1], 2, 1,
+                 &avpriv_h263_cbpy_tab[0][0], 2, 1, 64);
         INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33,
-                 &ff_mvtab[0][1], 2, 1,
-                 &ff_mvtab[0][0], 2, 1, 538);
+                 &avpriv_mvtab[0][1], 2, 1,
+                 &avpriv_mvtab[0][0], 2, 1, 538);
         avpriv_init_rl(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]);
         avpriv_init_rl(&ff_rl_intra_aic, ff_h263_static_rl_table_store[1]);
         INIT_VLC_RL(ff_h263_rl_inter, 554);
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index 2da7237..d67ee8e 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -488,10 +488,10 @@  void ff_h263_encode_mb(MpegEncContext * s,
         if(s->dquant) cbpc+= 8;
         if(s->mv_type==MV_TYPE_16X16){
             put_bits(&s->pb,
-                    ff_h263_inter_MCBPC_bits[cbpc],
-                    ff_h263_inter_MCBPC_code[cbpc]);
+                    avpriv_h263_inter_MCBPC_bits[cbpc],
+                    avpriv_h263_inter_MCBPC_code[cbpc]);
 
-            put_bits(&s->pb, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
+            put_bits(&s->pb, avpriv_h263_cbpy_tab[cbpy][1], avpriv_h263_cbpy_tab[cbpy][0]);
             if(s->dquant)
                 put_bits(&s->pb, 2, dquant_code[s->dquant+2]);
 
@@ -515,9 +515,9 @@  void ff_h263_encode_mb(MpegEncContext * s,
             }
         }else{
             put_bits(&s->pb,
-                    ff_h263_inter_MCBPC_bits[cbpc+16],
-                    ff_h263_inter_MCBPC_code[cbpc+16]);
-            put_bits(&s->pb, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
+                    avpriv_h263_inter_MCBPC_bits[cbpc+16],
+                    avpriv_h263_inter_MCBPC_code[cbpc+16]);
+            put_bits(&s->pb, avpriv_h263_cbpy_tab[cbpy][1], avpriv_h263_cbpy_tab[cbpy][0]);
             if(s->dquant)
                 put_bits(&s->pb, 2, dquant_code[s->dquant+2]);
 
@@ -610,21 +610,21 @@  void ff_h263_encode_mb(MpegEncContext * s,
         if (s->pict_type == AV_PICTURE_TYPE_I) {
             if(s->dquant) cbpc+=4;
             put_bits(&s->pb,
-                ff_h263_intra_MCBPC_bits[cbpc],
-                ff_h263_intra_MCBPC_code[cbpc]);
+                avpriv_h263_intra_MCBPC_bits[cbpc],
+                avpriv_h263_intra_MCBPC_code[cbpc]);
         } else {
             if(s->dquant) cbpc+=8;
             put_bits(&s->pb, 1, 0);     /* mb coded */
             put_bits(&s->pb,
-                ff_h263_inter_MCBPC_bits[cbpc + 4],
-                ff_h263_inter_MCBPC_code[cbpc + 4]);
+                avpriv_h263_inter_MCBPC_bits[cbpc + 4],
+                avpriv_h263_inter_MCBPC_code[cbpc + 4]);
         }
         if (s->h263_aic) {
             /* XXX: currently, we do not try to use ac prediction */
             put_bits(&s->pb, 1, 0);     /* no AC prediction */
         }
         cbpy = cbp >> 2;
-        put_bits(&s->pb, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
+        put_bits(&s->pb, avpriv_h263_cbpy_tab[cbpy][1], avpriv_h263_cbpy_tab[cbpy][0]);
         if(s->dquant)
             put_bits(&s->pb, 2, dquant_code[s->dquant+2]);
 
@@ -662,7 +662,7 @@  void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code)
     if (val == 0) {
         /* zero vector */
         code = 0;
-        put_bits(&s->pb, ff_mvtab[code][1], ff_mvtab[code][0]);
+        put_bits(&s->pb, avpriv_mvtab[code][1], avpriv_mvtab[code][0]);
     } else {
         bit_size = f_code - 1;
         range = 1 << bit_size;
@@ -676,7 +676,7 @@  void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code)
         code = (val >> bit_size) + 1;
         bits = val & (range - 1);
 
-        put_bits(&s->pb, ff_mvtab[code][1] + 1, (ff_mvtab[code][0] << 1) | sign);
+        put_bits(&s->pb, avpriv_mvtab[code][1] + 1, (avpriv_mvtab[code][0] << 1) | sign);
         if (bit_size > 0) {
             put_bits(&s->pb, bit_size, bits);
         }
@@ -692,7 +692,7 @@  static void init_mv_penalty_and_fcode(MpegEncContext *s)
         for(mv=-MAX_MV; mv<=MAX_MV; mv++){
             int len;
 
-            if(mv==0) len= ff_mvtab[0][1];
+            if(mv==0) len= avpriv_mvtab[0][1];
             else{
                 int val, bit_size, code;
 
@@ -704,9 +704,9 @@  static void init_mv_penalty_and_fcode(MpegEncContext *s)
                 val--;
                 code = (val >> bit_size) + 1;
                 if(code<33){
-                    len= ff_mvtab[code][1] + 1 + bit_size;
+                    len= avpriv_mvtab[code][1] + 1 + bit_size;
                 }else{
-                    len= ff_mvtab[32][1] + av_log2(code>>5) + 2 + bit_size;
+                    len= avpriv_mvtab[32][1] + av_log2(code>>5) + 2 + bit_size;
                 }
             }
 
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index bf412fa..55c50a9 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -675,10 +675,10 @@  void ff_mpeg4_encode_mb(MpegEncContext * s,
             if(s->mv_type==MV_TYPE_16X16){
                 if(s->dquant) cbpc+= 8;
                 put_bits(&s->pb,
-                        ff_h263_inter_MCBPC_bits[cbpc],
-                        ff_h263_inter_MCBPC_code[cbpc]);
+                        avpriv_h263_inter_MCBPC_bits[cbpc],
+                        avpriv_h263_inter_MCBPC_code[cbpc]);
 
-                put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
+                put_bits(pb2, avpriv_h263_cbpy_tab[cbpy][1], avpriv_h263_cbpy_tab[cbpy][0]);
                 if(s->dquant)
                     put_bits(pb2, 2, dquant_code[s->dquant+2]);
 
@@ -700,10 +700,10 @@  void ff_mpeg4_encode_mb(MpegEncContext * s,
             }else if(s->mv_type==MV_TYPE_FIELD){
                 if(s->dquant) cbpc+= 8;
                 put_bits(&s->pb,
-                        ff_h263_inter_MCBPC_bits[cbpc],
-                        ff_h263_inter_MCBPC_code[cbpc]);
+                        avpriv_h263_inter_MCBPC_bits[cbpc],
+                        avpriv_h263_inter_MCBPC_code[cbpc]);
 
-                put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
+                put_bits(pb2, avpriv_h263_cbpy_tab[cbpy][1], avpriv_h263_cbpy_tab[cbpy][0]);
                 if(s->dquant)
                     put_bits(pb2, 2, dquant_code[s->dquant+2]);
 
@@ -730,9 +730,9 @@  void ff_mpeg4_encode_mb(MpegEncContext * s,
             }else{
                 assert(s->mv_type==MV_TYPE_8X8);
                 put_bits(&s->pb,
-                        ff_h263_inter_MCBPC_bits[cbpc+16],
-                        ff_h263_inter_MCBPC_code[cbpc+16]);
-                put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
+                        avpriv_h263_inter_MCBPC_bits[cbpc+16],
+                        avpriv_h263_inter_MCBPC_code[cbpc+16]);
+                put_bits(pb2, avpriv_h263_cbpy_tab[cbpy][1], avpriv_h263_cbpy_tab[cbpy][0]);
 
                 if(!s->progressive_sequence){
                     if(cbp)
@@ -793,18 +793,18 @@  void ff_mpeg4_encode_mb(MpegEncContext * s,
         if (s->pict_type == AV_PICTURE_TYPE_I) {
             if(s->dquant) cbpc+=4;
             put_bits(&s->pb,
-                ff_h263_intra_MCBPC_bits[cbpc],
-                ff_h263_intra_MCBPC_code[cbpc]);
+                avpriv_h263_intra_MCBPC_bits[cbpc],
+                avpriv_h263_intra_MCBPC_code[cbpc]);
         } else {
             if(s->dquant) cbpc+=8;
             put_bits(&s->pb, 1, 0);     /* mb coded */
             put_bits(&s->pb,
-                ff_h263_inter_MCBPC_bits[cbpc + 4],
-                ff_h263_inter_MCBPC_code[cbpc + 4]);
+                avpriv_h263_inter_MCBPC_bits[cbpc + 4],
+                avpriv_h263_inter_MCBPC_code[cbpc + 4]);
         }
         put_bits(pb2, 1, s->ac_pred);
         cbpy = cbp >> 2;
-        put_bits(pb2, ff_h263_cbpy_tab[cbpy][1], ff_h263_cbpy_tab[cbpy][0]);
+        put_bits(pb2, avpriv_h263_cbpy_tab[cbpy][1], avpriv_h263_cbpy_tab[cbpy][0]);
         if(s->dquant)
             put_bits(dc_pb, 2, dquant_code[s->dquant+2]);
 
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 7d6bd67..9b59f4a 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -507,7 +507,7 @@  static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
     if (val == 0) {
         /* zero vector */
         code = 0;
-        put_bits(&s->pb, ff_mvtab[code][1], ff_mvtab[code][0]);
+        put_bits(&s->pb, avpriv_mvtab[code][1], avpriv_mvtab[code][0]);
     } else {
         bit_size = s->f_code - 1;
         range = 1 << bit_size;
@@ -526,7 +526,7 @@  static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
         code = (val >> bit_size) + 1;
         bits = val & (range - 1);
 
-        put_bits(&s->pb, ff_mvtab[code][1] + 1, (ff_mvtab[code][0] << 1) | sign);
+        put_bits(&s->pb, avpriv_mvtab[code][1] + 1, (avpriv_mvtab[code][0] << 1) | sign);
         if (bit_size > 0) {
             put_bits(&s->pb, bit_size, bits);
         }
@@ -570,8 +570,8 @@  void ff_msmpeg4_encode_mb(MpegEncContext * s,
             else             coded_cbp= cbp;
 
             put_bits(&s->pb,
-                     ff_h263_cbpy_tab[coded_cbp>>2][1],
-                     ff_h263_cbpy_tab[coded_cbp>>2][0]);
+                     avpriv_h263_cbpy_tab[coded_cbp>>2][1],
+                     avpriv_h263_cbpy_tab[coded_cbp>>2][0]);
 
             s->misc_bits += get_bits_diff(s);
 
@@ -627,8 +627,8 @@  void ff_msmpeg4_encode_mb(MpegEncContext * s,
             }
             put_bits(&s->pb, 1, 0);             /* no AC prediction yet */
             put_bits(&s->pb,
-                     ff_h263_cbpy_tab[cbp>>2][1],
-                     ff_h263_cbpy_tab[cbp>>2][0]);
+                     avpriv_h263_cbpy_tab[cbp>>2][1],
+                     avpriv_h263_cbpy_tab[cbp>>2][0]);
         }else{
             if (s->pict_type == AV_PICTURE_TYPE_I) {
                 put_bits(&s->pb,
@@ -1316,8 +1316,8 @@  av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
                  &ff_v2_mb_type[0][1], 2, 1,
                  &ff_v2_mb_type[0][0], 2, 1, 128);
         INIT_VLC_STATIC(&v2_mv_vlc, V2_MV_VLC_BITS, 33,
-                 &ff_mvtab[0][1], 2, 1,
-                 &ff_mvtab[0][0], 2, 1, 538);
+                 &avpriv_mvtab[0][1], 2, 1,
+                 &avpriv_mvtab[0][0], 2, 1, 538);
 
         INIT_VLC_STATIC(&ff_mb_non_intra_vlc[0], MB_NON_INTRA_VLC_BITS, 128,
                      &ff_wmv2_inter_table[0][0][1], 8, 4,
diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c
index b3dc454..a0e45bc 100644
--- a/libavcodec/msmpeg4data.c
+++ b/libavcodec/msmpeg4data.c
@@ -592,9 +592,9 @@  static const int8_t table4_run[168] = {
  29, 30, 31, 32, 33, 34, 35, 36,
 };
 
-extern const uint16_t ff_inter_vlc[103][2];
-extern const int8_t ff_inter_level[102];
-extern const int8_t ff_inter_run[102];
+extern const uint16_t avpriv_inter_vlc[103][2];
+extern const int8_t avpriv_inter_level[102];
+extern const int8_t avpriv_inter_run[102];
 
 extern const uint16_t ff_mpeg4_intra_vlc[103][2];
 extern const int8_t ff_mpeg4_intra_level[102];
@@ -647,9 +647,9 @@  RLTable ff_rl_table[NB_RL_TABLES] = {
     {
         102,
         58,
-        ff_inter_vlc,
-        ff_inter_run,
-        ff_inter_level,
+        avpriv_inter_vlc,
+        avpriv_inter_run,
+        avpriv_inter_level,
     },
 };
 
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 80f96c8..ad1d9dc 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -43,7 +43,7 @@ 
 #undef NDEBUG
 #include <assert.h>
 
-extern const uint8_t ff_mvtab[33][2];
+extern const uint8_t avpriv_mvtab[33][2];
 
 static VLC svq1_block_type;
 static VLC svq1_motion_component;
@@ -769,8 +769,8 @@  static av_cold int svq1_decode_init(AVCodecContext *avctx)
         &ff_svq1_block_type_vlc[0][0], 2, 1, 6);
 
     INIT_VLC_STATIC(&svq1_motion_component, 7, 33,
-        &ff_mvtab[0][1], 2, 1,
-        &ff_mvtab[0][0], 2, 1, 176);
+        &avpriv_mvtab[0][1], 2, 1,
+        &avpriv_mvtab[0][0], 2, 1, 176);
 
     for (i = 0; i < 6; i++) {
         static const uint8_t sizes[2][6] = {{14, 10, 14, 18, 16, 18}, {10, 10, 14, 14, 14, 16}};