Merge branch 'blender-v2.93-release'

This commit is contained in:
Campbell Barton 2021-04-30 15:14:47 +10:00
commit 1597eb82d6
1 changed files with 5 additions and 5 deletions

View File

@ -881,12 +881,12 @@ static void ffmpeg_postprocess(struct anim *anim)
# endif
if (need_aligned_ffmpeg_buffer(anim)) {
uint8_t *src = anim->pFrameRGB->data[0];
uint8_t *dst = (uint8_t *)ibuf->rect;
uint8_t *buf_src = anim->pFrameRGB->data[0];
uint8_t *buf_dst = (uint8_t *)ibuf->rect;
for (int y = 0; y < anim->y; y++) {
memcpy(dst, src, anim->x * 4);
dst += anim->x * 4;
src += anim->pFrameRGB->linesize[0];
memcpy(buf_dst, buf_src, anim->x * 4);
buf_dst += anim->x * 4;
buf_src += anim->pFrameRGB->linesize[0];
}
}