NULL safety checks

[melted] / src / framework / mlt_transition.c

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 12443d7..afafc23 100644 (file)
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -72,7 +72,7 @@ mlt_transition mlt_transition_new( )
 
 mlt_service mlt_transition_service( mlt_transition this )
 {
-       return &this->parent;
+       return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the properties interface.
@@ -197,6 +197,10 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
                {
                        // Process the transition
                        *frame = mlt_transition_process( this, this->a_frame, this->b_frame );
+                       if ( !mlt_properties_get_int( mlt_frame_properties( this->a_frame ), "test_image" ) )
+                               mlt_properties_set_int( mlt_frame_properties( this->b_frame ), "test_image", 1 );
+                       if ( !mlt_properties_get_int( mlt_frame_properties( this->a_frame ), "test_audio" ) )
+                               mlt_properties_set_int( mlt_frame_properties( this->b_frame ), "test_audio", 1 );
                        this->a_held = 0;
                }
                else