diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-28 18:07:45 +0600 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-07-28 14:13:22 +0200 |
| commit | 45838561f2f14339acdf53ffa3adbfe8e6db7514 (patch) | |
| tree | e3ae54bc3866e8184749f490390e0ba46e5210d4 /libavcodec/vc1dec.c | |
| parent | 2bf369b60c7d56dd73887a0156c37676d0fa7e29 (diff) | |
| download | ffmpeg-45838561f2f14339acdf53ffa3adbfe8e6db7514.tar.gz | |
vc1dec: Override invalid macroblock quantizer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index fd515c754e..c6cbfc1270 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1048,6 +1048,11 @@ static void vc1_mc_4mv_chroma4(VC1Context *v) mquant = v->altpq; \ if ((edges&8) && s->mb_y == (s->mb_height - 1)) \ mquant = v->altpq; \ + if (!mquant || mquant > 31) { \ + av_log(v->s.avctx, AV_LOG_ERROR, \ + "Overriding invalid mquant %d\n", mquant); \ + mquant = 1; \ + } \ } /** |