h264: fix size of arrays in ff_h264_check_intra_pred_mode()
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Jun 2013 17:39:45 +0000 (19:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:17:43 +0000 (15:17 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6a33f5d20b6ef2eae2cbb959b001cb125a564b7)

Conflicts:

libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c

index 9f4a61c..3851070 100644 (file)
@@ -141,8 +141,8 @@ 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 > 3U) {
         av_log(h->s.avctx, AV_LOG_ERROR,