diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:46:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:46:59 +0200 |
| commit | ced5c8e6b36fa219cf7ea7d934da2105ae99a887 (patch) | |
| tree | d88c6558e611376f1937b4b7a278c7facd2e639a | |
| parent | 1e83191d5c830a836bcd03d520272ef711503ac9 (diff) | |
| parent | 51ae8e26af8f5b26efb41edc0fe4812368d16ae9 (diff) | |
| download | ffmpeg-ced5c8e6b36fa219cf7ea7d934da2105ae99a887.tar.gz | |
Merge commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9' into release/0.10
* commit '51ae8e26af8f5b26efb41edc0fe4812368d16ae9':
h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3174401cfd..5145343887 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -106,10 +106,10 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h){ int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma){ MpegEncContext * const s = &h->s; - static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; - static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; + static const int8_t top[4] = { LEFT_DC_PRED8x8, 1, -1, -1 }; + static const int8_t left[5] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 }; - if(mode > 6U) { + if(mode > 3U) { av_log(h->s.avctx, AV_LOG_ERROR, "out of range intra chroma pred mode at %d %d\n", s->mb_x, s->mb_y); return -1; } |