X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fh263data.h;h=40e4199d0bebf240d63c03881420c15a5923e2ce;hb=96ff02f1b4f382936b9e212a98d80d0b92d5058c;hp=2968531a55889fccab38515fcae5a8a52a593c92;hpb=115329f16062074e11ccf3b89ead6176606c9696;p=ffmpeg

diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index 2968531a558..40e4199d0be 100644
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -1,8 +1,36 @@
+/*
+ * copyright (c) 2000,2001 Fabrice Bellard
+ * H263+ support
+ * copyright (c) 2001 Juan J. Sierralta P
+ * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
 /**
- * @file h263data.h
+ * @file libavcodec/h263data.h
  * H.263 tables.
  */
 
+#ifndef AVCODEC_H263DATA_H
+#define AVCODEC_H263DATA_H
+
+#include <stdint.h>
+#include "mpegvideo.h"
 
 /* intra MCBPC, mb_type = (intra), then (intraq) */
 const uint8_t intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 };
@@ -65,7 +93,7 @@ static const int h263_mb_type_b_map[15]= {
     MB_TYPE_INTRA4x4                | MB_TYPE_CBP | MB_TYPE_QUANT,
 };
 
-const uint8_t cbpc_b_tab[4][2] = {
+static const uint8_t cbpc_b_tab[4][2] = {
 {0, 1},
 {2, 2},
 {7, 3},
@@ -157,7 +185,7 @@ static RLTable rl_inter = {
     inter_level,
 };
 
-const uint16_t intra_vlc_aic[103][2] = {
+static const uint16_t intra_vlc_aic[103][2] = {
 {  0x2,  2 }, {  0x6,  3 }, {  0xe,  4 }, {  0xc,  5 },
 {  0xd,  5 }, { 0x10,  6 }, { 0x11,  6 }, { 0x12,  6 },
 { 0x16,  7 }, { 0x1b,  8 }, { 0x20,  9 }, { 0x21,  9 },
@@ -186,7 +214,7 @@ const uint16_t intra_vlc_aic[103][2] = {
 { 0x59, 12 }, { 0x5a, 12 }, {  0x3,  7 },
 };
 
-const int8_t intra_run_aic[102] = {
+static const int8_t intra_run_aic[102] = {
  0,  0,  0,  0,  0,  0,  0,  0,
  0,  0,  0,  0,  0,  0,  0,  0,
  0,  0,  0,  0,  0,  0,  0,  0,
@@ -202,7 +230,7 @@ const int8_t intra_run_aic[102] = {
 18, 19, 20, 21, 22, 23,
 };
 
-const int8_t intra_level_aic[102] = {
+static const int8_t intra_level_aic[102] = {
  1,  2,  3,  4,  5,  6,  7,  8,
  9, 10, 11, 12, 13, 14, 15, 16,
 17, 18, 19, 20, 21, 22, 23, 24,
@@ -274,8 +302,8 @@ const uint16_t ff_mba_max[6]={
      47,  98, 395,1583,6335,9215
 };
 
-const uint8_t ff_mba_length[6]={
-      6,   7,   9,  11,  13,  14
+const uint8_t ff_mba_length[7]={
+      6,   7,   9,  11,  13,  14,  14
 };
 
 const uint8_t ff_h263_loop_filter_strength[32]={
@@ -283,3 +311,4 @@ const uint8_t ff_h263_loop_filter_strength[32]={
     0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12
 };
 
+#endif /* AVCODEC_H263DATA_H */