h264: (trivial) remove unneeded macro argument in x86/cabac.h

[ffmpeg] / libavcodec / snowdata.h

diff --git a/libavcodec/snowdata.h b/libavcodec/snowdata.h
index 7a88f247636fb62f2e48ac1a2134b07bda887377..490fdf8bd65a9ec275016657ee2c2ccdfbc06ba6 100644 (file)
--- a/libavcodec/snowdata.h
+++ b/libavcodec/snowdata.h
@@ -101,7 +101,7 @@ static const uint8_t obmc4[16]={
 //error:0.000000
 };
 
-const int8_t quant3bA[256]={
+const int8_t ff_quant3bA[256]={
  0, 0, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
  1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
  1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
@@ -120,13 +120,13 @@ const int8_t quant3bA[256]={
  1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
 };
 
-const uint8_t * const obmc_tab[4]= {
+const uint8_t * const ff_obmc_tab[4]= {
     obmc32, obmc16, obmc8, obmc4
 };
 
 /* runtime generated tables */
-uint8_t qexp[QROOT];
-int scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES];
+uint8_t ff_qexp[QROOT];
+int ff_scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES];
 
 
 #endif /* AVCODEC_SNOW_H */