From: Paul B Mahol Date: Fri, 17 Feb 2017 09:46:52 +0000 (+0100) Subject: avcodec/fmvc: fix decoding of odd size videos X-Git-Tag: android-x86-7.1-r1~2080 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1a71df9bac4bb5840b394e76f98aa34ce0c3eebc;p=android-x86%2Fexternal-ffmpeg.git avcodec/fmvc: fix decoding of odd size videos Signed-off-by: Paul B Mahol --- diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c index 54bb6f95f9..c5e5b3d961 100644 --- a/libavcodec/fmvc.c +++ b/libavcodec/fmvc.c @@ -441,7 +441,7 @@ static int decode_frame(AVCodecContext *avctx, for (y = 0; y < avctx->height; y++) { memcpy(dst, src, avctx->width * s->bpp); dst -= frame->linesize[0]; - src += avctx->width * s->bpp; + src += s->stride * 4; } } else { int block, nb_blocks, type, k, l; @@ -518,7 +518,7 @@ static int decode_frame(AVCodecContext *avctx, for (y = 0; y < avctx->height; y++) { memcpy(ddst, ssrc, avctx->width * s->bpp); ddst -= frame->linesize[0]; - ssrc += avctx->width * s->bpp; + ssrc += s->stride * 4; } }