From d1f6b7102608984b126ccd5a6655eb4b4e61dfb0 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Mon, 20 Sep 2004 20:38:12 +0000 Subject: [PATCH 1/1] Minor fixes git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@432 d19143bc-622f-0410-bfdd-b5b2a6649095 --- demo/consumers.ini | 2 +- src/modules/avformat/producer_avformat.c | 3 ++- src/modules/gtk2/producer_pixbuf.c | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/demo/consumers.ini b/demo/consumers.ini index e7070708..44651a29 100644 --- a/demo/consumers.ini +++ b/demo/consumers.ini @@ -1,5 +1,5 @@ SDL Default sdl -SDL Half D1 sdl:384x288 rescale=nearest +SDL Half D1 sdl:360x288 rescale=nearest resize=1 SDL High Latency sdl buffer=12 rescale=none SDL Progressive sdl progressive=1 Westley to Terminal westley diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index c36c890c..2d2e11bf 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -679,11 +679,12 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) if ( codec != NULL ) { double source_fps = 0; + int norm_aspect_ratio = mlt_properties_get_int( properties, "norm_aspect_ratio" ); // XXX: We won't know the real aspect ratio until an image is decoded // but we do need it now (to satisfy filter_resize) - take a guess based // on pal/ntsc - if ( codec_context->sample_aspect_ratio.num > 0 ) + if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 ) { mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) ); } diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 3fc0fb07..10b5b8bb 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -303,8 +303,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) ); this->filenames[ this->count ++ ] = strdup( fullname ); - mlt_properties_set_position( properties, "out", 250 ); - // Teehe - when the producer closes, delete the temp file and the space allo mlt_properties_set_data( properties, "__temporary_file__", this->filenames[ this->count - 1 ], 0, ( mlt_destructor )unlink, NULL ); } @@ -332,7 +330,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i gap ++; } } - mlt_properties_set_position( properties, "out", this->count * 250 ); } else if ( strstr( filename, "/.all." ) != NULL ) { @@ -366,7 +363,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i { this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) ); this->filenames[ this->count ++ ] = strdup( filename ); - mlt_properties_set_position( properties, "out", 250 ); } } -- 2.39.2