virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

mpeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless overreads from crashing

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-14 03:17:13 +01:00
parent e1631f8ebe
commit 7acee6654c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpeg12data.c
View File

@ -27,7 +27,7 @@
#include "mpeg12data.h" #include "mpeg12data.h"
const uint16_t ff_mpeg1_default_intra_matrix[64] = { const uint16_t ff_mpeg1_default_intra_matrix[256] = {
8, 16, 19, 22, 26, 27, 29, 34, 8, 16, 19, 22, 26, 27, 29, 34,
16, 16, 22, 24, 27, 29, 34, 37, 16, 16, 22, 24, 27, 29, 34, 37,
19, 22, 26, 27, 29, 34, 34, 38, 19, 22, 26, 27, 29, 34, 34, 38,

2
libavcodec/mpeg12data.h
View File

@ -32,7 +32,7 @@
#include "libavutil/rational.h" #include "libavutil/rational.h"
#include "rl.h" #include "rl.h"
extern const uint16_t ff_mpeg1_default_intra_matrix[64]; extern const uint16_t ff_mpeg1_default_intra_matrix[];
extern const uint16_t ff_mpeg1_default_non_intra_matrix[64]; extern const uint16_t ff_mpeg1_default_non_intra_matrix[64];
extern const uint16_t ff_mpeg12_vlc_dc_lum_code[12]; extern const uint16_t ff_mpeg12_vlc_dc_lum_code[12];