Add disable property to mlt_transition.

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 90eb774ef2389c584f27c624b8dc2e84e3865040..86a57d4ea4cf30ab5b4ce444986940e7cf0f07a9 100644 (file)
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -471,7 +471,7 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
                }
 
                // Finally, process the a and b frames
-               if ( active )
+               if ( active && !mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( self ), "disable" ) )
                {
                        mlt_frame a_frame_ptr = self->frames[ !reverse_order ? a_frame : b_frame ];
                        mlt_frame b_frame_ptr = self->frames[ !reverse_order ? b_frame : a_frame ];

diff --git a/src/framework/mlt_transition.h b/src/framework/mlt_transition.h
index 3e9d4513f9d12cb4826f9e8412e8cc10585c771b..e6befd978c9f866eacbe42ca6392a41171784c03 100644 (file)
--- a/src/framework/mlt_transition.h
+++ b/src/framework/mlt_transition.h
@@ -36,6 +36,7 @@
  * \properties \em accepts_blanks a flag to indicate if the transition should accept blank frames
  * \properties \em always_active a flag to indicate that the in and out points do not apply
  * \properties \em _transition_type 1 for video, 2 for audio
+ * \properties \em disable Set this to disable the transition while keeping it in the object model.
  */
 
 struct mlt_transition_s