diff options
| author | Xiaohan Wang <xhwang@chromium.org> | 2018-02-03 01:43:35 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-14 01:08:21 +0100 |
| commit | 07e46226ae50ce0e4754b5cc11fafaffb1d4116a (patch) | |
| tree | 2a5550f25ab0b700b2cac1a7839b0f154e6a8b4a /libavcodec | |
| parent | d797d9f21562f21e04668fa8997f7a629ad01cff (diff) | |
| download | ffmpeg-07e46226ae50ce0e4754b5cc11fafaffb1d4116a.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>
(cherry picked from commit 71f39de2a57efc8db1d607b09c162c3b806cd45d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 3fa5b2e197..97ec6fd4ae 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -1113,6 +1113,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; } } |