From: lilo_booter Date: Tue, 26 Jul 2005 15:35:23 +0000 (+0000) Subject: + Correction to long outstanding oddity regarding composite.out - not needed in many... X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=991fd89e3398352f63eb9c9a7c82486e2654ed2f;p=melted + Correction to long outstanding oddity regarding composite.out - not needed in many cases now git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@785 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c index 51181d7..1ca0b8b 100644 --- a/src/modules/core/filter_watermark.c +++ b/src/modules/core/filter_watermark.c @@ -75,6 +75,9 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // Pass all the composite. properties on the filter down mlt_properties_pass( composite_properties, properties, "composite." ); + if ( mlt_properties_get( properties, "composite.out" ) == NULL ) + mlt_properties_set_int( composite_properties, "out", mlt_properties_get_int( properties, "_out" ) ); + // Force a refresh mlt_properties_set_int( composite_properties, "refresh", 1 ); } @@ -223,6 +226,9 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) // Get a unique name to store the frame position char *name = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "_unique_id" ); + // Assign the frame out point to the filter (just in case we need it later) + mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "_out", mlt_properties_get_int( properties, "out" ) ); + // Assign the current position to the name mlt_properties_set_position( properties, name, mlt_frame_get_position( frame ) - mlt_filter_get_in( this ) );