X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.c;h=46197804ae0bc4f355740ff2d5f99d3f5f1409e4;hb=c95736fd9ee742f5e6db06bbe579f23895f55eba;hp=d8173d670d6b902c10372efee05a776c70ee8651;hpb=13a70eccf0f8b2c2b0ce1c32862c687b693710ee;p=melted diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c index d8173d6..4619780 100644 --- a/src/framework/mlt_service.c +++ b/src/framework/mlt_service.c @@ -160,6 +160,11 @@ int mlt_service_connect_producer( mlt_service this, mlt_service producer, int in // Get the service base mlt_service_base *base = this->local; + // Special case 'track' index - only works for last filter(s) in a particular chain + // but allows a filter to apply to the output frame regardless of which track it comes from + if ( index == -1 ) + index = 0; + // Check if the producer is already registered with this service for ( i = 0; i < base->count; i ++ ) if ( base->in[ i ] == producer ) @@ -358,7 +363,6 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index ) mlt_position in = mlt_properties_get_position( properties, "in" ); mlt_position out = mlt_properties_get_position( properties, "out" ); mlt_properties_inc_ref( properties ); - mlt_service_unlock( this ); result = this->get_frame( this, frame, index ); if ( result == 0 ) { @@ -370,9 +374,11 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index ) } mlt_service_apply_filters( this, *frame, 1 ); mlt_deque_push_back( MLT_FRAME_SERVICE_STACK( *frame ), this ); + mlt_service_unlock( this ); } else { + mlt_service_unlock( this ); mlt_service_close( this ); } return result;