aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2007-12-06 17:12:02 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-12-06 17:12:02 +0000
commitdbf7150441041686e9a78cf6b516829784335053 (patch)
tree9d1d1e8ff6ed1233644f177c3a5dd5810bb9562d
parent1918057c8a3bc37c27e476d16736fe8bc76afd34 (diff)
downloadffmpeg-dbf7150441041686e9a78cf6b516829784335053.tar.gz
Update tables for RV40 decoder
Originally committed as revision 11175 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/rv40data.h3
-rw-r--r--libavcodec/rv40vlc2.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/rv40data.h b/libavcodec/rv40data.h
index 13bc06c962..17bcb04cff 100644
--- 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 a61ae27005..f1664fcd6a 100644
--- 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
};
//@}