X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=e78e3295dd93733ab03d159364828269fa047c39;hb=363fbe3ecac63a0b932fa909c974b6e5d696f543;hp=dfce3d1ad10a3268192f6726af71f65e3c1a427d;hpb=4c96cb2b639338d6308dd473983b9b4cbb9e27c9;p=melted

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index dfce3d1..e78e329 100644
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -134,27 +134,12 @@ mlt_consumer consumer_sdl_init( char *arg )
 		{
 			this->width = mlt_properties_get_int( this->properties, "width" );
 			this->height = mlt_properties_get_int( this->properties, "height" );
-			
-			// Default window size
-			this->window_width = ( float )this->height * this->display_aspect;
-			this->window_height = this->height;
-		}
-		else
-		{
-			if ( (int)( ( float )this->width / this->height * 1000 ) != 
-				 (int)( this->display_aspect * 1000 ) ) 
-			{
-				// Override these
-				this->display_aspect = ( float )this->width / this->height;
-				this->aspect_ratio = 1.0;
-				mlt_properties_set_double( this->properties, "aspect_ratio", this->aspect_ratio );
-			}
-			
-			// Set window size
-			this->window_width = this->width;
-			this->window_height = this->height;
 		}
 
+		// Default window size
+		this->window_width = ( float )this->height * this->display_aspect;
+		this->window_height = this->height;
+
 		// Set the sdl flags
 		this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
 
@@ -433,15 +418,14 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 		}
 	
 		if ( width != this->width || height != this->height || 
-			 ( int )( this->last_frame_aspect * 1000 ) != ( int )( mlt_frame_get_aspect_ratio( frame ) * 1000 ) )
+			 ( ( int )( this->last_frame_aspect * 1000 ) != ( int )( mlt_frame_get_aspect_ratio( frame ) * 1000 ) &&
+			 ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 ) ) )
+
 		{
-			if ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 )
-			{
-				this->width = width;
-				this->height = height;
-				this->last_frame_aspect = mlt_frame_get_aspect_ratio( frame );
-				changed = 1;
-			}
+			this->width = width;
+			this->height = height;
+			this->last_frame_aspect = mlt_frame_get_aspect_ratio( frame );
+			changed = 1;
 		}
 
 		if ( this->sdl_screen == NULL || changed )