[libav-commits] vc1dec: Override invalid macroblock quantizer

Michael Niedermayer git at libav.org
Sat Jul 28 14:13:37 CEST 2012


Module: libav
Branch: master
Commit: 45838561f2f14339acdf53ffa3adbfe8e6db7514

Author:    Michael Niedermayer <michaelni at gmx.at>
Committer: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:      Sat Jul 28 18:07:45 2012 +0600

vc1dec: Override invalid macroblock quantizer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Kostya Shishkov <kostya.shishkov at gmail.com>

---

 libavcodec/vc1dec.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index fd515c7..c6cbfc1 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;                                        \
+        }                                                      \
     }
 
 /**



More information about the libav-commits mailing list