Update tables for RV40 decoder

Originally committed as revision 11175 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/rv40data.h b/libavcodec/rv40data.h
index 13bc06c..17bcb04 100644 (file)
--- a/libavcodec/rv40data.h
+++ b/libavcodec/rv40data.h
@@ -34,8 +34,7 @@
  */
 //@{
 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

diff --git a/libavcodec/rv40vlc2.h b/libavcodec/rv40vlc2.h
index a61ae27..f1664fc 100644 (file)
--- a/libavcodec/rv40vlc2.h
+++ b/libavcodec/rv40vlc2.h
@@ -666,7 +666,7 @@ static const uint8_t ptype_vlc_syms[PTYPE_VLC_SIZE] = {
 
 /** reverse of ptype_vlc_syms */
 static const uint8_t block_num_to_ptype_vlc_num[12] = {
- 0, 1, 2, 3, 0, 0, 0, 0, 4, 5, 0, 6
+ 0, 1, 2, 3, 0, 0, 2, 0, 4, 5, 0, 6
 };
 //@}