sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Revert part of recent fix for movie resolution.

Browse Source 
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,
This commit is contained in:
Sergey Sharybin 2011-10-13 08:56:21 +00:00
parent c40b976ea8
commit 05b47c28fa
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/imbuf/intern/anim_movie.c
View File

@ -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;