aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-10 22:43:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-10 23:12:42 +0100
commit2440040c7bde23f295ef04b159a677b81749012f (patch)
treec54e01199b2c0e7f5509eb1b720b3938fffc2169 /libavcodec
parent8e9a0a3568d915387c35645ea7d85945b98d2197 (diff)
downloadffmpeg-2440040c7bde23f295ef04b159a677b81749012f.tar.gz
vc1: add missing entries to ff_vc1_fps_nr.
Fixes out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vc1data.c2
-rw-r--r--libavcodec/vc1data.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c
index d80061de70..434e57626f 100644
--- a/libavcodec/vc1data.c
+++ b/libavcodec/vc1data.c
@@ -84,7 +84,7 @@ const uint8_t ff_vc1_mbmode_intfrp[2][15][4] = {
}
};
-const int ff_vc1_fps_nr[5] = { 24, 25, 30, 50, 60 },
+const int ff_vc1_fps_nr[7] = { 24, 25, 30, 50, 60, 48, 72},
ff_vc1_fps_dr[2] = { 1000, 1001 };
const uint8_t ff_vc1_pquant_table[3][32] = {
/* Implicit quantizer */
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index 89fb6ca938..fbcda6c54b 100644
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -41,7 +41,7 @@ extern const int ff_vc1_ttfrm_to_tt[4];
extern const uint8_t ff_vc1_mv_pmode_table[2][5];
extern const uint8_t ff_vc1_mv_pmode_table2[2][4];
-extern const int ff_vc1_fps_nr[5], ff_vc1_fps_dr[2];
+extern const int ff_vc1_fps_nr[7], ff_vc1_fps_dr[2];
extern const uint8_t ff_vc1_pquant_table[3][32];
/* MBMODE table for interlaced frame P-picture */