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:
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/anim_movie.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 01b3e71ad8a..c1ef8c4792b 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -418,7 +418,6 @@ static int startffmpeg(struct anim * anim) {
int frs_num;
double frs_den;
int streamcount;
- int width, height;
#ifdef FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT
/* The following for color space determination */
@@ -475,9 +474,6 @@ static int startffmpeg(struct anim * anim) {
pCodecCtx->workaround_bugs = 1;
- width = pCodecCtx->width;
- height = pCodecCtx->height;
-
if(avcodec_open(pCodecCtx, pCodec) < 0) {
av_close_input_file(pFormatCtx);
return -1;
@@ -502,8 +498,8 @@ static int startffmpeg(struct anim * anim) {
anim->params = 0;
- anim->x = width;
- anim->y = height;
+ anim->x = pCodecCtx->width;
+ anim->y = pCodecCtx->height;
anim->interlacing = 0;
anim->orientation = 0;
anim->framesize = anim->x * anim->y * 4;