avcodec: Drop long-deprecated imgconvert.h header

[ffmpeg] / libavcodec / rv40data.h

diff --git a/libavcodec/rv40data.h b/libavcodec/rv40data.h
index d0a5493c2ba01101da5318e952f177160c8f74f2..42328af5a8727d3468f7dd74c3c303b380988c78 100644 (file)
--- a/libavcodec/rv40data.h
+++ b/libavcodec/rv40data.h
@@ -2,48 +2,47 @@
  * RealVideo 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 rv40data.h
- * Miscellaneous RV40 tables.
+ * @file
+ * miscellaneous RV40 tables
  */
 
-#ifndef FFMPEG_RV40DATA_H
-#define FFMPEG_RV40DATA_H
+#ifndef AVCODEC_RV40DATA_H
+#define AVCODEC_RV40DATA_H
 
 #include <stdint.h>
 
 /**
- * Standard widths and heights coded in RV40
+ * standard widths and heights coded in RV40
  */
 //@{
 static const int rv40_standard_widths[]   = { 160, 172, 240, 320, 352, 640, 704, 0};
-static const int rv40_standard_heights[]  = { 120, 132, 144, 240, 288, 480, 0, 0};
-static const int rv40_standard_heights2[] = { 180, 360, 576, 0};
+static const int rv40_standard_heights[]  = { 120, 132, 144, 240, 288, 480, -8, -10, 180, 360, 576, 0};
 //@}
 
 #define MODE2_PATTERNS_NUM 20
 /**
- * Intra types table
+ * intra types table
  *
  * These values are actually coded 3-tuples
- * used for detecting standard block configurations
+ * used for detecting standard block configurations.
  */
 static const uint16_t rv40_aic_table_index[MODE2_PATTERNS_NUM] = {
  0x000, 0x100, 0x200,
@@ -55,8 +54,8 @@ static const uint16_t rv40_aic_table_index[MODE2_PATTERNS_NUM] = {
 };
 
 /**
- * Luma quantizer values
- * Second table is used for inter blocks
+ * luma quantizer values
+ * The second table is used for inter blocks.
  */
 static const uint8_t rv40_luma_dc_quant[2][32] = {
  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
@@ -66,23 +65,9 @@ static const uint8_t rv40_luma_dc_quant[2][32] = {
 };
 
 /**
- * @begingroup loopfilter coefficients used by RV40 loop filter
+ * @name Coefficients used by the RV40 loop filter
  * @{
  */
-/**
- * Dither values for deblocking filter - left/top values
- */
-static const uint8_t rv40_dither_l[16] = {
-    0x40, 0x50, 0x20, 0x60, 0x30, 0x50, 0x40, 0x30,
-    0x50, 0x40, 0x50, 0x30, 0x60, 0x20, 0x50, 0x40
-};
-/**
- * Dither values for deblocking filter - right/bottom values
- */
-static const uint8_t rv40_dither_r[16] = {
-    0x40, 0x30, 0x60, 0x20, 0x50, 0x30, 0x30, 0x40,
-    0x40, 0x40, 0x50, 0x30, 0x20, 0x60, 0x30, 0x40
-};
 
 /** alpha parameter for RV40 loop filter - almost the same as in JVT-A003r1 */
 static const uint8_t rv40_alpha_tab[32] = {
@@ -113,4 +98,4 @@ static const uint8_t rv40_filter_clip_tbl[3][32] = {
 };
 /** @} */ // end loopfilter group
 
-#endif /* FFMPEG_RV40DATA_H */
+#endif /* AVCODEC_RV40DATA_H */