consumer avformat fix and silly stuff in lumas

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

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 753280256fdd92e1b71b67a9602a6e84c68bcdce..1e801ce7b4a9f94c42f136e956ace4f208048cfd 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -920,8 +920,11 @@ static void *consumer_thread( void *arg )
                if ( real_time_output && frames % 25 == 0 )
                {
                        long passed = time_difference( &ante );
-                       long pending = ( ( ( long )sample_fifo_used( fifo ) * 1000 ) / frequency ) * 1000;
-                       passed -= pending;
+                       if ( fifo != NULL )
+                       {
+                               long pending = ( ( ( long )sample_fifo_used( fifo ) * 1000 ) / frequency ) * 1000;
+                               passed -= pending;
+                       }
                        if ( passed < total_time )
                        {
                                long total = ( total_time - passed );

diff --git a/src/modules/core/filter_luma.c b/src/modules/core/filter_luma.c
index e36ee3a2cc22c8b494a624cdab8fbe3ee6658565..62277a4b0ca4f7d0974705096fb857f177e40804 100644 (file)
--- a/src/modules/core/filter_luma.c
+++ b/src/modules/core/filter_luma.c
@@ -52,7 +52,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                {
                        mlt_properties luma_properties = mlt_transition_properties( luma );
                        mlt_properties_set_int( luma_properties, "in", 0 );
-                       mlt_properties_set_int( luma_properties, "out", 24 );
+                       mlt_properties_set_int( luma_properties, "out", out );
                        mlt_properties_set_int( luma_properties, "reverse", 1 );
                        mlt_properties_pass( luma_properties, properties, "luma." );
                        mlt_properties_set_data( properties, "luma", luma, 0, ( mlt_destructor )mlt_transition_close, NULL );

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 024397421e919877ac9313b666c250d7fd510b22..28d89a4b7fe5f55f982e8596342dbc03820a58dd 100644 (file)
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -469,6 +469,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        // Ensure we get scaling on the b_frame
        mlt_properties_set( b_props, "rescale.interp", "nearest" );
 
+       if ( mlt_properties_get( properties, "fixed" ) )
+               mix = mlt_properties_get_double( properties, "fixed" );
+
        if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
                // Composite the frames using a luma map
                luma_composite( a_frame, b_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,