From 3374a9bd3da60d13e5b361a809bcef172aa23920 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Thu, 1 Sep 2005 10:32:35 +0000 Subject: [PATCH] consumer_sdl.c consumer_sdl_still.c + Corrections to silly mistake regarding initialisation from previous checkin git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@822 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/sdl/consumer_sdl.c | 6 +++--- src/modules/sdl/consumer_sdl_still.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 3810069..b652b9e 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -194,14 +194,14 @@ int consumer_start( mlt_consumer parent ) } else { - if ( SDL_GetVideoSurface( ) != NULL ) - this->sdl_screen = SDL_GetVideoSurface( ); + this->sdl_screen = SDL_GetVideoSurface( ); } if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) ) SDL_InitSubSystem( SDL_INIT_AUDIO ); - this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + if ( this->sdl_screen == NULL ) + this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); pthread_create( &this->thread, NULL, consumer_thread, this ); } diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index c55d0e2..9957dd1 100644 --- a/src/modules/sdl/consumer_sdl_still.c +++ b/src/modules/sdl/consumer_sdl_still.c @@ -193,7 +193,7 @@ static int consumer_start( mlt_consumer parent ) } } - if ( this->sdl_screen != NULL ) + if ( this->sdl_screen == NULL ) this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); pthread_create( &this->thread, NULL, consumer_thread, this ); -- 1.7.4.4