aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaohan Wang <xhwang@chromium.org>2018-02-03 01:43:35 -0800
committerMichael Niedermayer <michael@niedermayer.cc>2018-02-14 01:06:37 +0100
commit71f39de2a57efc8db1d607b09c162c3b806cd45d (patch)
treec4c81693388d0b66a2c3211740ac441694575581
parent474194a8d0f2812802c275f6ed4f0fd5cd58ae0e (diff)
downloadffmpeg-71f39de2a57efc8db1d607b09c162c3b806cd45d.tar.gz
avcodec/h264_cavlc: Set valid qscale value in ff_h264_decode_mb_cavlc()
When ff_h264_decode_mb_cavlc() failed due to wrong sl->qscale values, e.g. dquant out of range, set the qscale to be a valid value before returning -1 and exiting the function. The qscale value can be used later e.g. in loop filter. BUG=806122 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/h264_cavlc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 187b1c64e2..5e6a20304a 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -1111,6 +1111,7 @@ decode_intra_mb:
else sl->qscale -= max_qp+1;
if (((unsigned)sl->qscale) > max_qp){
av_log(h->avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, sl->mb_x, sl->mb_y);
+ sl->qscale = max_qp;
return -1;
}
}