[FFmpeg-cvslog] Fix the size of workspace buffers in the motion pixels decoder.
Laurent Aimar
git at videolan.org
Sat Oct 1 21:38:58 CEST 2011
ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Fri Sep 30 00:05:49 2011 +0200| [9b1bf0852548bffde22b8f27f8eb32ab51559bf1] | committer: Michael Niedermayer
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 at gmx.at>
(cherry picked from commit 62234a4d3a30f3949694781ef8a941ef55b210fa)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b1bf0852548bffde22b8f27f8eb32ab51559bf1
---
libavcodec/motionpixels.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index a3afc02..635a7d1 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;
More information about the ffmpeg-cvslog
mailing list