diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-10-13 12:56:21 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-10-13 12:56:21 +0400 |
| commit | 05b47c28fa8f12bc16db3e21ddcb9a57f3f1e7fa (patch) | |
| tree | ac5f8bf6553346399f33432e12ea9fdc2cd3183b /source/blender/imbuf | |
| parent | c40b976ea87bcbab01a8f939d20996ba1a465772 (diff) | |
Revert part of recent fix for movie resolution.
It helped to make things works better for some movies but it
didn't help proxies to work properly. Correct fix seems a bit larger
and better not be made atm, so to keep behavior of proxies and
original movie consistent keep resolution behaves like it was before
recent changes,
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 8 |
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; |