Consumer valerie, pushes, and assorted modifications

[melted] / src / modules / sdl / consumer_sdl.c

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index dfce3d1..3b94043 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -433,15 +433,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 )