X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fproducer_libdv.c;h=9516c10339454559f025dd00e19ae9093ead0896;hb=a12d28fe778fe2c816b3a60229e2ac440648a884;hp=ae968468beddee5a8f5c5a1b09488ac7fa7a11c1;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted

diff --git a/src/modules/dv/producer_libdv.c b/src/modules/dv/producer_libdv.c
index ae96846..9516c10 100644
--- a/src/modules/dv/producer_libdv.c
+++ b/src/modules/dv/producer_libdv.c
@@ -236,7 +236,7 @@ static int producer_collect_info( producer_libdv this )
 			// Parse the header for meta info
 			dv_parse_header( dv_decoder, dv_data );
 			mlt_properties_set_double( properties, "aspect_ratio", 
-				dv_format_wide( dv_decoder ) ? ( this->is_pal ? 512.0/351.0 : 96.0/79.0 ) : ( this->is_pal ? 128.0/117.0 : 72.0/79.0 ) );
+				dv_format_wide( dv_decoder ) ? ( this->is_pal ? 118.0/81.0 : 40.0/33.0 ) : ( this->is_pal ? 59.0/54.0 : 10.0/11.0 ) );
 
 			// Return the decoder
 			dv_decoder_return( dv_decoder );
@@ -374,7 +374,6 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
 	else
 	{
 		// No audio available on the frame, so get test audio (silence)
-		this->get_audio = NULL;
 		mlt_frame_get_audio( this, buffer, format, frequency, channels, samples );
 	}
 
@@ -421,10 +420,10 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		dv_parse_header( dv_decoder, data );
 		//mlt_properties_set_int( properties, "progressive", dv_is_progressive( dv_decoder ) );
 		mlt_properties_set_double( properties, "aspect_ratio", 
-			dv_format_wide( dv_decoder ) ? ( this->is_pal ? 512.0/351.0 : 96.0/79.0 ) : ( this->is_pal ? 128.0/117.0 : 72.0/79.0 ) );
+			dv_format_wide( dv_decoder ) ? ( this->is_pal ? 118.0/81.0 : 40.0/33.0 ) : ( this->is_pal ? 59.0/54.0 : 10.0/11.0 ) );
 
 		// Hmm - register audio callback
-		( *frame )->get_audio = producer_get_audio;
+		mlt_frame_push_audio( *frame, producer_get_audio );
 
 		// Push the quality string
 		mlt_frame_push_service( *frame, mlt_properties_get( MLT_PRODUCER_PROPERTIES( producer ), "quality" ) );