diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:04:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 21:16:00 +0100 |
| commit | aeb1621d1f173fc59eb52781caa6c7437e657b1b (patch) | |
| tree | ab83b07e58fef3b7e41f58c73a8d181530ab44ca /libavcodec | |
| parent | 81e3f819bd1b1bf6aff7a8adf3f50262f383b9f9 (diff) | |
| parent | fe27aeaeab07142b1acd2690c64ee6973bdd7eba (diff) | |
Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'
* commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba':
mpeg12enc: increase declared size of block function argument
See: 2cf514354bbeebb2334d00ab54c3fcb8ae2ee678
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 6946c60b4b..cadf6f2450 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -874,7 +874,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); |