VP8: faster MV clipping

[ffmpeg] / libavcodec / dcahuff.h

diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h
index a140f3b8b8b8891d06e02ba06f9ebcb1e864bc1a..cbc8429e59a69fe1948eccccce086ec65c09784d 100644 (file)
--- a/libavcodec/dcahuff.h
+++ b/libavcodec/dcahuff.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_DCAHUFF_H
-#define FFMPEG_DCAHUFF_H
+#ifndef AVCODEC_DCAHUFF_H
+#define AVCODEC_DCAHUFF_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -1021,7 +1021,7 @@ static const uint8_t bitalloc_129_bits_g[129] =
 
 static const uint8_t bitalloc_sizes[10] = { 3, 5, 7, 9, 13, 17, 25, 33, 65, 129 };
 
-static const uint8_t bitalloc_offsets[10] =
+static const int8_t bitalloc_offsets[10] =
     { -1, -2, -3, -4, -6, -8, -12, -16, -32, -64 };
 
 static const uint8_t bitalloc_maxbits[10][7] = {
@@ -1037,7 +1037,7 @@ static const uint8_t bitalloc_maxbits[10][7] = {
     { 9, 9, 9, 9, 9, 9, 9 }
 };
 
-static const uint16_t* bitalloc_codes[10][8] = {
+static const uint16_t* const bitalloc_codes[10][8] = {
   { bitalloc_3_codes, NULL },
   { bitalloc_5_codes_a,  bitalloc_5_codes_b,  bitalloc_5_codes_c,  NULL },
   { bitalloc_7_codes_a,  bitalloc_7_codes_b,  bitalloc_7_codes_c,  NULL },
@@ -1055,7 +1055,7 @@ static const uint16_t* bitalloc_codes[10][8] = {
     bitalloc_129_codes_e, bitalloc_129_codes_f, bitalloc_129_codes_g, NULL }
 };
 
-static const uint8_t* bitalloc_bits[10][8] = {
+static const uint8_t* const bitalloc_bits[10][8] = {
   { bitalloc_3_bits, NULL },
   { bitalloc_5_bits_a,  bitalloc_5_bits_b,  bitalloc_5_bits_c,  NULL },
   { bitalloc_7_bits_a,  bitalloc_7_bits_b,  bitalloc_7_bits_c,  NULL },
@@ -1073,4 +1073,4 @@ static const uint8_t* bitalloc_bits[10][8] = {
     bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
 };
 
-#endif /* FFMPEG_DCAHUFF_H */
+#endif /* AVCODEC_DCAHUFF_H */