[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40985] trunk/blender/source/blender/imbuf /intern/anim_movie.c: Revert part of recent fix for movie resolution.

[Sergey Sharybin]

Revision: 40985
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40985
Author:   nazgul
Date:     2011-10-13 08:56:21 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
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,

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/anim_movie.c

Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c	2011-10-13 06:59:09 UTC (rev 40984)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c	2011-10-13 08:56:21 UTC (rev 40985)
@@ -418,7 +418,6 @@
 	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 @@
 
 	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 @@
 
 	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;