diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-30 00:05:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-01 20:54:31 +0200 |
| commit | 9b1bf0852548bffde22b8f27f8eb32ab51559bf1 (patch) | |
| tree | 63d750266c5172bca1c8890043a2998261787600 | |
| parent | 376b0994746cbb14438c2a58ea1bdb2c9b934610 (diff) | |
| download | ffmpeg-9b1bf0852548bffde22b8f27f8eb32ab51559bf1.tar.gz | |
Fix the size of workspace buffers in the motion pixels decoder.
Some buffers must be mod 4 in width and/or height.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 62234a4d3a30f3949694781ef8a941ef55b210fa)
| -rw-r--r-- | libavcodec/motionpixels.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index a3afc02582..635a7d14a1 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -52,14 +52,16 @@ typedef struct MotionPixelsContext { static av_cold int mp_decode_init(AVCodecContext *avctx) { MotionPixelsContext *mp = avctx->priv_data; + int w4 = (avctx->width + 3) & ~3; + int h4 = (avctx->height + 3) & ~3; motionpixels_tableinit(); mp->avctx = avctx; dsputil_init(&mp->dsp, avctx); - mp->changes_map = av_mallocz(avctx->width * avctx->height); + mp->changes_map = av_mallocz(avctx->width * h4); mp->offset_bits_len = av_log2(avctx->width * avctx->height) + 1; mp->vpt = av_mallocz(avctx->height * sizeof(YuvPixel)); - mp->hpt = av_mallocz(avctx->height * avctx->width / 16 * sizeof(YuvPixel)); + mp->hpt = av_mallocz(h4 * w4 / 16 * sizeof(YuvPixel)); avctx->pix_fmt = PIX_FMT_RGB555; avcodec_get_frame_defaults(&mp->frame); return 0; |