Browse Source

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

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 12 years ago
parent
commit
7acee6654c
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libavcodec/mpeg12data.c
  2. +1
    -1
      libavcodec/mpeg12data.h

+ 1
- 1
libavcodec/mpeg12data.c View File

@@ -27,7 +27,7 @@

#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,
16, 16, 22, 24, 27, 29, 34, 37,
19, 22, 26, 27, 29, 34, 34, 38,


+ 1
- 1
libavcodec/mpeg12data.h View File

@@ -32,7 +32,7 @@
#include "libavutil/rational.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_mpeg12_vlc_dc_lum_code[12];


Loading…
Cancel
Save