libilbc: set channel layout

[ffmpeg] / libavcodec / h261data.h

diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h
index 7d013fe6cacf03b20a127d8cc9a2eb5a4eaf00fe..2c610151c798531e768a9f6b9c98551494408aa2 100644 (file)
--- a/libavcodec/h261data.h
+++ b/libavcodec/h261data.h
@@ -2,29 +2,36 @@
  * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  * copyright (c) 2004 Maarten Daniels
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library 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 this library; 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
  */
 
 /**
- * @file h261data.h
+ * @file
  * H.261 tables.
  */
-#define MB_TYPE_H261_FIL 0x800000
+
+#ifndef AVCODEC_H261DATA_H
+#define AVCODEC_H261DATA_H
+
+#include <stdint.h>
+#include "h261.h"
 
 // H.261 VLC table for macroblock addressing
-const uint8_t h261_mba_code[35] = {
+static const uint8_t h261_mba_code[35] = {
      1,  3,  2,  3,
      2,  3,  2,  7,
      6, 11, 10,  9,
@@ -38,7 +45,7 @@ const uint8_t h261_mba_code[35] = {
     1             //(start code)
 };
 
-const uint8_t h261_mba_bits[35] = {
+static const uint8_t h261_mba_bits[35] = {
      1,  3,  3,  4,
      4,  5,  5,  7,
      7,  8,  8,  8,
@@ -53,13 +60,13 @@ const uint8_t h261_mba_bits[35] = {
 };
 
 //H.261 VLC table for macroblock type
-const uint8_t h261_mtype_code[10] = {
+static const uint8_t h261_mtype_code[10] = {
     1,  1,  1,  1,
     1,  1,  1,  1,
     1,  1
 };
 
-const uint8_t h261_mtype_bits[10] = {
+static const uint8_t h261_mtype_bits[10] = {
     4,  7,  1,  5,
     9,  8, 10,  3,
     2,  6
@@ -79,7 +86,7 @@ static const int h261_mtype_map[10]= {
 };
 
 //H.261 VLC table for motion vectors
-const uint8_t h261_mv_tab[17][2] = {
+static const uint8_t h261_mv_tab[17][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}, {12,10}
 };
@@ -90,7 +97,7 @@ static const int mvmap[17] =
 };
 
 //H.261 VLC table for coded block pattern
-const uint8_t h261_cbp_tab[63][2] =
+static const uint8_t h261_cbp_tab[63][2] =
 {
     {11,5}, {9,5}, {13,6}, {13,4}, {23,7}, {19,7}, {31,8}, {12,4},
     {22,7}, {18,7}, {30,8}, {19,5}, {27,8}, {23,8}, {19,8}, {11,4},
@@ -103,7 +110,7 @@ const uint8_t h261_cbp_tab[63][2] =
 };
 
 //H.261 VLC table for transform coefficients
-const uint16_t h261_tcoeff_vlc[65][2] = {
+static const uint16_t h261_tcoeff_vlc[65][2] = {
 { 0x2, 2 }, { 0x3, 2 },{ 0x4, 4 },{ 0x5, 5 },
 { 0x6, 7 },{ 0x26, 8 },{ 0x21, 8 },{ 0xa, 10 },
 { 0x1d, 12 },{ 0x18, 12 },{ 0x13, 12 },{ 0x10 , 12 },
@@ -123,7 +130,7 @@ const uint16_t h261_tcoeff_vlc[65][2] = {
 { 0x1, 6 }                                             //escape
 };
 
-const int8_t h261_tcoeff_level[64] = {
+static const int8_t h261_tcoeff_level[64] = {
     0,  1,  2,  3,  4,  5,  6,  7,
     8,  9, 10, 11, 12, 13, 14, 15,
     1,  2,  3,  4,  5,  6,  7,  1,
@@ -134,7 +141,7 @@ const int8_t h261_tcoeff_level[64] = {
     1,  1,  1,  1,  1,  1,  1,  1
 };
 
-const int8_t h261_tcoeff_run[64] = {
+static const int8_t h261_tcoeff_run[64] = {
     0,
     0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  1,
@@ -153,3 +160,5 @@ static RLTable h261_rl_tcoeff = {
     h261_tcoeff_run,
     h261_tcoeff_level,
 };
+
+#endif /* AVCODEC_H261DATA_H */