Minor fixes

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@432 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/demo/consumers.ini b/demo/consumers.ini
index e70707084a88745785936864e25ac4b2fe13f5a3..44651a29543c4e050dde16603e055068424d551d 100644 (file)
--- 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 c36c890c6bd8b014db9877b20983f462145154e7..2d2e11bfde36a020e65db098a90144556917d6cc 100644 (file)
--- 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 3fc0fb07d3445f5d9c6ed905a71c9d820311bdd1..10b5b8bb6bc7d76653f7fddebecd32ebbf8b183b 100644 (file)
--- 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 );
                }
        }