flacdec: allow mid-stream channel layout change

[ffmpeg] / libavcodec / dcahuff.h

diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h
index 2833d6789a7fc5bdb7c065dd572827c86603c63e..254fc76a91396191ba79cd66705b0b004726925b 100644 (file)
--- a/libavcodec/dcahuff.h
+++ b/libavcodec/dcahuff.h
@@ -3,23 +3,26 @@
  * Copyright (C) 2004 Gildas Bazin
  * Copyright (C) 2007 Konstantin Shishkov
  *
- * 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_DCAHUFF_H
+#define AVCODEC_DCAHUFF_H
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -1018,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] = {
@@ -1034,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 },
@@ -1052,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 },
@@ -1069,3 +1072,5 @@ static const uint8_t* bitalloc_bits[10][8] = {
   { bitalloc_129_bits_a, bitalloc_129_bits_b, bitalloc_129_bits_c, bitalloc_129_bits_d,
     bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
 };
+
+#endif /* AVCODEC_DCAHUFF_H */