X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fintrax8huf.h;h=6bf01f388ae4c2481bf58b6862d4328ee9ad9efe;hb=843cd4a3edf254c2a42663777c1633d67cbef238;hp=6d3653e71904e5ade6b4d18f89e392b6965804d4;hpb=9abc7e0fdc5b99e4503e22c9084195867e312222;p=ffmpeg

diff --git a/libavcodec/intrax8huf.h b/libavcodec/intrax8huf.h
index 6d3653e7190..6bf01f388ae 100644
--- a/libavcodec/intrax8huf.h
+++ b/libavcodec/intrax8huf.h
@@ -1,25 +1,28 @@
 /*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_INTRAX8HUF_H
+#define AVCODEC_INTRAX8HUF_H
+
 #include <inttypes.h>
 
 
-const uint16_t ff_x8_orient_lowquant_table[4][12][2]={
+static const uint16_t x8_orient_lowquant_table[4][12][2]={
     {//0
         {0x0000,  1}, {0x0004,  3}, {0x0005,  3}, {0x000C,  4},
         {0x000D,  4}, {0x0038,  6}, {0x001D,  5}, {0x0039,  6},
@@ -39,7 +42,7 @@ const uint16_t ff_x8_orient_lowquant_table[4][12][2]={
     }
 };
 
-const uint16_t ff_x8_orient_highquant_table[2][12][2]={
+static const uint16_t x8_orient_highquant_table[2][12][2]={
     {//0
         {0x0000,  2}, {0x0001,  2}, {0x0004,  3}, {0x0005,  3},
         {0x0006,  3}, {0x0038,  6}, {0x001D,  5}, {0x0039,  6},
@@ -53,7 +56,7 @@ const uint16_t ff_x8_orient_highquant_table[2][12][2]={
 #define MAX_OR_VLC_BITS 7
 
 
-const uint16_t ff_x8_dc_lowquant_table[8][34][2]={
+static const uint16_t x8_dc_lowquant_table[8][34][2]={
     {//0
         {0x0000,  5}, {0x0001,  4}, {0x0001,  5}, {0x0004,  5},
         {0x0005,  5}, {0x0006,  5}, {0x000E,  6}, {0x000F,  6},
@@ -137,7 +140,7 @@ const uint16_t ff_x8_dc_lowquant_table[8][34][2]={
     }
 };
 
-const uint16_t ff_x8_dc_highquant_table[8][34][2]={
+static const uint16_t x8_dc_highquant_table[8][34][2]={
     {//0
         {0x0000,  5}, {0x0001,  4}, {0x0002,  4}, {0x0001,  5},
         {0x0006,  5}, {0x0004,  4}, {0x0007,  5}, {0x000A,  5},
@@ -223,7 +226,7 @@ const uint16_t ff_x8_dc_highquant_table[8][34][2]={
 #define MAX_DC_VLC_BITS 14
 
 
-const uint16_t ff_x8_ac0_lowquant_table[8][77][2]={
+static const uint16_t x8_ac0_lowquant_table[8][77][2]={
     {//0
         {0x0000,  2}, {0x0002,  3}, {0x0006,  4}, {0x000E,  5},
         {0x001E,  6}, {0x003E,  7}, {0x003F,  7}, {0x0040,  7},
@@ -395,7 +398,7 @@ const uint16_t ff_x8_ac0_lowquant_table[8][77][2]={
     }
 };
 
-const uint16_t ff_x8_ac0_highquant_table[8][77][2]={
+static const uint16_t x8_ac0_highquant_table[8][77][2]={
     {//0
         {0x0000,  3}, {0x0002,  4}, {0x000C,  6}, {0x000D,  6},
         {0x001C,  7}, {0x000F,  6}, {0x1D00, 15}, {0x003B,  8},
@@ -567,7 +570,7 @@ const uint16_t ff_x8_ac0_highquant_table[8][77][2]={
     }
 };
 
-const uint16_t ff_x8_ac1_lowquant_table[8][77][2]={
+static const uint16_t x8_ac1_lowquant_table[8][77][2]={
     {//0
         {0x0000,  3}, {0x0002,  4}, {0x0003,  4}, {0x0008,  5},
         {0x0012,  6}, {0x0026,  7}, {0x0014,  6}, {0x004E,  8},
@@ -739,7 +742,7 @@ const uint16_t ff_x8_ac1_lowquant_table[8][77][2]={
     }
 };
 
-const uint16_t ff_x8_ac1_highquant_table[8][77][2]={
+static const uint16_t x8_ac1_highquant_table[8][77][2]={
     {//0
         {0x0000,  3}, {0x0002,  4}, {0x0006,  5}, {0x0007,  5},
         {0x0008,  5}, {0x0009,  5}, {0x0014,  6}, {0x002A,  7},
@@ -911,3 +914,5 @@ const uint16_t ff_x8_ac1_highquant_table[8][77][2]={
     }
 };
 #define MAX_AC_VLC_BITS 16
+
+#endif /* AVCODEC_INTRAX8HUF_H */