aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-04 09:36:58 -0500
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-11-11 11:26:02 +0100
commitfe27aeaeab07142b1acd2690c64ee6973bdd7eba (patch)
tree9141924b94cd4081a1c7c9ca7c44fc73bbf57467 /libavcodec
parent52f954da7594c31ad94c9bcb54290145b59b27f5 (diff)
downloadffmpeg-fe27aeaeab07142b1acd2690c64ee6973bdd7eba.tar.gz
mpeg12enc: increase declared size of block function argument
CC: libav-stable@libav.org Bug-Id: CID 1047236 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpeg12enc.c4
-rw-r--r--libavcodec/mpegvideo.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 96130eaa0f..5fc5e36b27 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -658,7 +658,7 @@ next_coef:
}
static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
- int16_t block[6][64],
+ int16_t block[8][64],
int motion_x, int motion_y,
int mb_block_count)
{
@@ -935,7 +935,7 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
}
}
-void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[6][64],
+void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64],
int motion_x, int motion_y)
{
if (s->chroma_format == CHROMA_420)
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 35ea5b1110..d9f3f0ec1d 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -837,7 +837,7 @@ extern const uint8_t * const ff_mpeg2_dc_scale_table[4];
void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
void ff_mpeg1_encode_mb(MpegEncContext *s,
- int16_t block[6][64],
+ int16_t block[8][64],
int motion_x, int motion_y);
void ff_mpeg1_encode_init(MpegEncContext *s);
void ff_mpeg1_encode_slice_header(MpegEncContext *s);