X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=3a3907b373732e5ff757c591a3cb15fcf197e5fa;hb=7ecd47eeebf87332a4892d167baff959f0f6a11a;hp=29ee362fdcceec7164d0ba22c2fa52314cc7c95d;hpb=d33f444d4ef4c7bc4074d07a49eca0ab7d108394;p=melted diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c index 29ee362..3a3907b 100644 --- a/src/framework/mlt_tractor.c +++ b/src/framework/mlt_tractor.c @@ -1,7 +1,9 @@ -/* - * mlt_tractor.c -- tractor service class - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates +/** + * \file mlt_tractor.c + * \brief tractor service class + * + * Copyright (C) 2003-2008 Ushodaya Enterprises Limited + * \author Charles Yates * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,8 +20,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" - #include "mlt_tractor.h" #include "mlt_frame.h" #include "mlt_multitrack.h" @@ -285,7 +285,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra // Determine whether this tractor feeds to the consumer or stops here int global_feed = mlt_properties_get_int( properties, "global_feed" ); - // If we don't have one, we're in trouble... + // If we don't have one, we're in trouble... if ( multitrack != NULL ) { // Used to garbage collect all frames @@ -392,14 +392,14 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra first_video = temp; // Ensure that all frames know the aspect ratio of the background - mlt_properties_set_double( temp_properties, "output_ratio", + mlt_properties_set_double( temp_properties, "output_ratio", mlt_properties_get_double( MLT_FRAME_PROPERTIES( first_video ), "aspect_ratio" ) ); mlt_properties_set_int( MLT_FRAME_PROPERTIES( temp ), "image_count", ++ image_count ); image_count = 1; } } - + // Now stack callbacks if ( audio != NULL ) {