[FFmpeg-cvslog] h264: fix size of arrays in ff_h264_check_intra_pred_mode()

Michael Niedermayer git at videolan.org
Mon Apr 21 15:25:27 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 21 19:39:45 2013 +0200| [f294748cbce9627718d0c4112d8a1c0d2d93dfb1] | committer: Michael Niedermayer

h264: fix size of arrays in ff_h264_check_intra_pred_mode()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d6a33f5d20b6ef2eae2cbb959b001cb125a564b7)

Conflicts:

	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f294748cbce9627718d0c4112d8a1c0d2d93dfb1
---

 libavcodec/h264.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 9f4a61c..3851070 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -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,



More information about the ffmpeg-cvslog mailing list