From 573abb05e2b070c67daa9f97981e4c707ba96014 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Mon, 23 Feb 2004 16:16:10 +0000 Subject: [PATCH] Minor fixes git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@164 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/framework/mlt_frame.c | 1 - src/framework/mlt_producer.c | 4 ++-- src/modules/avformat/producer_avformat.c | 8 ++++---- src/modules/fezzik/producer_fezzik.c | 4 ---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index d0e08e3..409d368 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -198,7 +198,6 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for mlt_properties_set_double( test_properties, "consumer_scale", mlt_properties_get_double( properties, "consumer_scale" ) ); mlt_properties_set( test_properties, "rescale.interp", "nearest" ); mlt_frame_get_image( test_frame, buffer, format, width, height, writable ); - mlt_properties_inherit( properties, test_properties ); mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL ); mlt_properties_set_int( properties, "width", *width ); diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index c4508ba..9254710 100644 --- a/src/framework/mlt_producer.c +++ b/src/framework/mlt_producer.c @@ -70,8 +70,8 @@ int mlt_producer_init( mlt_producer this, void *child ) mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 ); mlt_properties_set_double( properties, "_speed", 1.0 ); mlt_properties_set_position( properties, "in", 0 ); - mlt_properties_set_position( properties, "out", 1799999 ); - mlt_properties_set_position( properties, "length", 1800000 ); + mlt_properties_set_position( properties, "out", 14999 ); + mlt_properties_set_position( properties, "length", 15000 ); mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 ); mlt_properties_set( properties, "eof", "pause" ); mlt_properties_set( properties, "resource", "" ); diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index f1ca0a7..bace227 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -444,9 +444,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form { register int i, j; register int half = *width >> 1; - uint8_t *Y = ( ( AVPicture * )&frame )->data[ 0 ]; - uint8_t *U = ( ( AVPicture * )&frame )->data[ 1 ]; - uint8_t *V = ( ( AVPicture * )&frame )->data[ 2 ]; + register uint8_t *Y = ( ( AVPicture * )&frame )->data[ 0 ]; + register uint8_t *U = ( ( AVPicture * )&frame )->data[ 1 ]; + register uint8_t *V = ( ( AVPicture * )&frame )->data[ 2 ]; register uint8_t *d = *buffer; register uint8_t *y, *u, *v; @@ -787,7 +787,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form mlt_properties_set_double( properties, "discrepancy", discrepancy ); } - if ( discrepancy * current_pts <= ( real_timecode - 0.02 ) ) + if ( !ignore && discrepancy * current_pts <= ( real_timecode - 0.02 ) ) ignore = 1; } diff --git a/src/modules/fezzik/producer_fezzik.c b/src/modules/fezzik/producer_fezzik.c index d5f686e..20ab7ea 100644 --- a/src/modules/fezzik/producer_fezzik.c +++ b/src/modules/fezzik/producer_fezzik.c @@ -83,10 +83,6 @@ static mlt_producer create_producer( char *file ) if ( result == NULL ) result = mlt_factory_producer( "avformat", file ); - // 4th line fallbacks - if ( result == NULL ) - result = mlt_factory_producer( "ffmpeg", file ); - return result; } -- 1.7.4.4