diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-16 15:05:03 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:56 +0100 |
| commit | 802deb2d136fd2e2b6f445476703c05a0b633aa2 (patch) | |
| tree | b169b9abdc4db9a1e05e25bdb9a980f823d33b4f | |
| parent | 290783b84866b1d16588f04c9c06ece37e523a69 (diff) | |
| download | ffmpeg-802deb2d136fd2e2b6f445476703c05a0b633aa2.tar.gz | |
svq3: Check for any negative return value from ff_h264_check_intra_pred_mode
Also pass on any returned error code.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 1115689d54ea95a084421f5a182b8dc56cbff978)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/svq3.c
| -rw-r--r-- | libavcodec/svq3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index ebe4fd9f5f..5097af5b5f 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -611,9 +611,9 @@ static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type) dir = i_mb_type_info[mb_type - 8].pred_mode; dir = (dir >> 1) ^ 3*(dir & 1) ^ 1; - if ((h->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) == -1){ - av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n"); - return -1; + if ((h->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) < 0) { + av_log(h->s.avctx, AV_LOG_ERROR, "ff_h264_check_intra_pred_mode < 0\n"); + return h->intra16x16_pred_mode; } cbp = i_mb_type_info[mb_type - 8].cbp; |