X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_region.c;h=41fce2fd087a9951d38df4ed287763f290e11289;hb=263e253a65f403b90eecf0b46b692e326e970b29;hp=4e2eb11e390499fbfee5d311a4fa0855f4c7d9f2;hpb=9ab18ed63c37a9ef65e06697ae25f5c198d788bb;p=melted diff --git a/src/modules/core/transition_region.c b/src/modules/core/transition_region.c index 4e2eb11..41fce2f 100644 --- a/src/modules/core/transition_region.c +++ b/src/modules/core/transition_region.c @@ -118,12 +118,12 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for // Error we will return int error = 0; - // Get the watermark transition object - mlt_transition this = mlt_frame_pop_service( frame ); - // We will get the 'b frame' from the frame stack mlt_frame b_frame = mlt_frame_pop_frame( frame ); + // Get the watermark transition object + mlt_transition this = mlt_frame_pop_service( frame ); + // Get the properties of the transition mlt_properties properties = mlt_transition_properties( this ); @@ -322,12 +322,12 @@ static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt // Push the transition on to the frame mlt_frame_push_service( a_frame, this ); - // Push the transition method - mlt_frame_push_get_image( a_frame, transition_get_image ); - // Push the b_frame on to the stack mlt_frame_push_frame( a_frame, b_frame ); + // Push the transition method + mlt_frame_push_get_image( a_frame, transition_get_image ); + // Return the frame return a_frame; }