Merge commit '59e8ec0aa8ab174701d01a3bfe96fedd0b7fcead'

[ffmpeg] / libavcodec / ffv1dec.c

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 0d10114ae9506a56802988bb9846c83f4734ce09..a14329a512af80ea31fab24370569a549a5a5ebd 100644 (file)
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -571,6 +571,7 @@ static int read_extra_header(FFV1Context *f)
     f->quant_table_count = get_symbol(c, state, 0);
     if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES || !f->quant_table_count) {
         av_log(f->avctx, AV_LOG_ERROR, "quant table count %d is invalid\n", f->quant_table_count);
+        f->quant_table_count = 0;
         return AVERROR_INVALIDDATA;
     }