X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Frv34vlc.h;h=f4670c162588c5e13460a8ea3f62c3ef9ab2bc79;hb=0a6b1a9f21d5970a0439e32303535ed85f07673e;hp=02d53cafb3190281a92fef8268d8872cc16a3ae4;hpb=74971185f3dce3ac55d4f56b4a5c9c686f1a6d6e;p=ffmpeg

diff --git a/libavcodec/rv34vlc.h b/libavcodec/rv34vlc.h
index 02d53cafb31..f4670c16258 100644
--- a/libavcodec/rv34vlc.h
+++ b/libavcodec/rv34vlc.h
@@ -2,30 +2,30 @@
  * RealVideo 3/4 decoder
  * 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
  */
 
 /**
- * @file rv34vlc.h
- * RV30/40 VLC tables.
+ * @file
+ * RV30/40 VLC tables
  */
 
-#ifndef FFMPEG_RV34VLC_H
-#define FFMPEG_RV34VLC_H
+#ifndef AVCODEC_RV34VLC_H
+#define AVCODEC_RV34VLC_H
 
 #include <stdint.h>
 
@@ -37,6 +37,7 @@
 #define FIRSTBLK_VLC_SIZE  864
 #define OTHERBLK_VLC_SIZE  108
 #define COEFF_VLC_SIZE      32
+#define MAX_VLC_SIZE      1296
 
 static const uint8_t rv34_table_intra_cbppat[NUM_INTRA_TABLES][2][CBPPAT_VLC_SIZE] = {
   {
@@ -2277,7 +2278,7 @@ static const uint8_t rv34_table_intra_thirdpat[NUM_INTRA_TABLES][2][OTHERBLK_VLC
 };
 
 
-static const uint8_t rv34_intra_coeffvlc[NUM_INTRA_TABLES][COEFF_VLC_SIZE] = {
+static const uint8_t rv34_intra_coeff[NUM_INTRA_TABLES][COEFF_VLC_SIZE] = {
 {
   1,  3,  3,  4,  4,  5,  6,  6,  6,  7,  7,  7,  8,  8,  9,  9,
   9,  9, 10, 10, 10, 11, 11, 11, 10, 10, 10, 12, 13, 14, 15, 15,
@@ -2301,7 +2302,7 @@ static const uint8_t rv34_intra_coeffvlc[NUM_INTRA_TABLES][COEFF_VLC_SIZE] = {
 };
 
 
-static const uint8_t rv34_inter_cbppatvlc[NUM_INTER_TABLES][CBPPAT_VLC_SIZE] = {
+static const uint8_t rv34_inter_cbppat[NUM_INTER_TABLES][CBPPAT_VLC_SIZE] = {
 {
   7,  9,  9,  8,  9,  8,  9,  8,  9,  9,  8,  8,  8,  8,  8,  4,
   7, 10, 11, 10, 11, 10, 12, 10, 12, 11, 11, 10, 11, 10, 10,  7,
@@ -2886,7 +2887,7 @@ static const uint8_t rv34_inter_cbppatvlc[NUM_INTER_TABLES][CBPPAT_VLC_SIZE] = {
 };
 
 
-static const uint8_t rv34_inter_cbpvlc[NUM_INTER_TABLES][4][CBP_VLC_SIZE] = {
+static const uint8_t rv34_inter_cbp[NUM_INTER_TABLES][4][CBP_VLC_SIZE] = {
 {
  { 0,  6,  6,  3,  6,  4,  5,  3,  6,  5,  4,  3,  3,  4,  4,  3 },
  { 0,  6,  6,  4,  6,  4,  5,  3,  6,  5,  4,  3,  4,  4,  4,  2 },
@@ -4020,7 +4021,7 @@ static const uint8_t rv34_table_inter_thirdpat[NUM_INTER_TABLES][2][OTHERBLK_VLC
 };
 
 
-static const uint8_t rv34_inter_coeffvlc[NUM_INTER_TABLES][COEFF_VLC_SIZE] = {
+static const uint8_t rv34_inter_coeff[NUM_INTER_TABLES][COEFF_VLC_SIZE] = {
 {
   1,  2,  4,  4,  5,  5,  6,  7,  7,  7,  8,  8,  8,  9,  9, 10,
  10, 10, 10, 11, 11, 11, 11, 12, 11, 11, 11, 13, 14, 15, 16, 16,
@@ -4051,4 +4052,4 @@ static const uint8_t rv34_inter_coeffvlc[NUM_INTER_TABLES][COEFF_VLC_SIZE] = {
 }
 };
 
-#endif /* FFMPEG_RV34VLC_H */
+#endif /* AVCODEC_RV34VLC_H */