Merge commit '1115689d54ea95a084421f5a182b8dc56cbff978'

* commit '1115689d54ea95a084421f5a182b8dc56cbff978': svq3: Check for any negative return value from ff_h264_check_intra_pred_mode Conflicts: libavcodec/svq3.c See: 019eb2c Merged-by: Michael Niedermayer <[email protected]>
SaschaVasarrhelyi · Sep 17, 2013 · a64b995 · a64b995
2 parents e960b3e + 1115689
commit a64b995
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
@@ -658,8 +658,8 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
         dir = (dir >> 1) ^ 3 * (dir & 1) ^ 1;
 
         if ((h->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) < 0) {
-            av_log(h->avctx, AV_LOG_ERROR, "check_intra_pred_mode < 0\n");
-            return -1;
+            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;