summaryrefslogtreecommitdiff
path: root/libavcodec/svq3.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-16 15:05:03 +0300
committerMartin Storsjö <martin@martin.st>2013-09-17 11:21:16 +0300
commit1115689d54ea95a084421f5a182b8dc56cbff978 (patch)
tree8e04bba0ec816d2660b5ffa45b974e42414bfbc3 /libavcodec/svq3.c
parentf8d1bb6723a677d7221c674a4e47e3d4cecfca17 (diff)
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>
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r--libavcodec/svq3.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index f99a83f582..82fa632712 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -652,9 +652,9 @@ static int svq3_decode_mb(SVQ3Context *s, 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->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->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;