Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-04-30 08:14:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-04-30 08:14:47 +0300
commit1597eb82d6507a8186f694cf79c9eea3138e4ae8 (patch)
tree7d4ae9ef0a89bed7033856909ce746b9c1109990 /source/blender/imbuf/intern
parent093ab05bcd6efd3e08409f4ca2edb9e84cf75bd1 (diff)
parente5c2e5e9e5fe9d1fd6178397cc29bb2552787083 (diff)
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r--source/blender/imbuf/intern/anim_movie.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 9e8224f58b2..96cd1fb61a4 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -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];
}
}