diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 15:07:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 15:07:09 +0200 |
| commit | a64b99503b962c757908e6796fc224aae23732ae (patch) | |
| tree | 8265c91a6e8c8163454822549d6ad0d9fcdf75c6 /libavcodec | |
| parent | e960b3e27e6091c3ce90b6dab2970c8a15884055 (diff) | |
| parent | 1115689d54ea95a084421f5a182b8dc56cbff978 (diff) | |
Merge commit '1115689d54ea95a084421f5a182b8dc56cbff978'
* commit '1115689d54ea95a084421f5a182b8dc56cbff978':
svq3: Check for any negative return value from ff_h264_check_intra_pred_mode
Conflicts:
libavcodec/svq3.c
See: 019eb2c77b7c315580200a5dbe6dabb1c97a3764
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/svq3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index cd21cae3fe..9499422f91 100644 --- 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; |