mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().

[ffmpeg] / libavcodec / wmaprodata.h

diff --git a/libavcodec/wmaprodata.h b/libavcodec/wmaprodata.h
index 3ca3d46d4fed12a13961396f6a2a25416e6e6120..f8a52bf4f40b52f61113de70adb5e62c1a80eba7 100644 (file)
--- a/libavcodec/wmaprodata.h
+++ b/libavcodec/wmaprodata.h
@@ -3,31 +3,34 @@
  * Copyright (c) 2007 Baptiste Coudurier, Benjamin Larsson, Ulion
  * Copyright (c) 2008 - 2009 Sascha Sommer
  *
- * 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  libavcodec/wmaprodata.h
+ * @file
  * @brief tables for wmapro decoding
  */
 
 #ifndef AVCODEC_WMAPRODATA_H
 #define AVCODEC_WMAPRODATA_H
 
+#include <stddef.h>
+#include <stdint.h>
+
 /**
  * @brief frequencies to divide the frequency spectrum into scale factor bands
  */
@@ -349,7 +352,7 @@ static const uint16_t coef0_run[HUFF_COEF0_SIZE] = {
       1,   0,   1,   0,   1,   0,
 };
 
-static const uint16_t coef0_level[HUFF_COEF0_SIZE] = {
+static const float coef0_level[HUFF_COEF0_SIZE] = {
       0,   0,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
       1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
       1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
@@ -390,7 +393,7 @@ static const uint16_t coef1_run[HUFF_COEF1_SIZE] = {
      1,  0,  1,  0,  1,  0,  1,  0,  0,  0,
 };
 
-static const uint16_t coef1_level[HUFF_COEF1_SIZE] = {
+static const float coef1_level[HUFF_COEF1_SIZE] = {
      0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
      1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
      1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
@@ -588,7 +591,7 @@ static const float default_decorrelation_matrices[] = {
 /**
  * @brief default decorrelation matrix offsets
  */
-static const float *default_decorrelation[] = {
+static const float * const default_decorrelation[] = {
     NULL,
     &default_decorrelation_matrices[0],
     &default_decorrelation_matrices[1],