X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=2ee9b2066ce9751f918a9b2d6fef07ca6e55d16d;hb=d33f444d4ef4c7bc4074d07a49eca0ab7d108394;hp=f6c468e33715ca0e4544586ac62e402fb5f0a933;hpb=40b169c095486ba1b868486eb98a47c41f36ce8c;p=melted diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c index f6c468e..2ee9b20 100644 --- a/src/modules/dv/consumer_libdv.c +++ b/src/modules/dv/consumer_libdv.c @@ -18,11 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -// Local header files -#include "consumer_libdv.h" -#include "producer_libdv.h" - // mlt Header files +#include #include // System header files @@ -34,6 +31,9 @@ // libdv header files #include +#define FRAME_SIZE_525_60 10 * 150 * 80 +#define FRAME_SIZE_625_50 12 * 150 * 80 + // Forward references. static int consumer_start( mlt_consumer this ); static int consumer_stop( mlt_consumer this ); @@ -47,13 +47,13 @@ static void consumer_close( mlt_consumer this ); /** Initialise the dv consumer. */ -mlt_consumer consumer_libdv_init( char *arg ) +mlt_consumer consumer_libdv_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { // Allocate the consumer mlt_consumer this = calloc( 1, sizeof( struct mlt_consumer_s ) ); // If memory allocated and initialises without error - if ( this != NULL && mlt_consumer_init( this, NULL ) == 0 ) + if ( this != NULL && mlt_consumer_init( this, NULL, profile ) == 0 ) { // Get properties from the consumer mlt_properties properties = MLT_CONSUMER_PROPERTIES( this );