Commit 71f39de2 authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Michael Niedermayer

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 474194a8
...@@ -1111,6 +1111,7 @@ decode_intra_mb: ...@@ -1111,6 +1111,7 @@ decode_intra_mb:
else sl->qscale -= max_qp+1; else sl->qscale -= max_qp+1;
if (((unsigned)sl->qscale) > max_qp){ 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); 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; return -1;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment