OS/X Patch from Torsten Spindler

[melted] / src / modules / dv / producer_libdv.c

diff --git a/src/modules/dv/producer_libdv.c b/src/modules/dv/producer_libdv.c
index ae96846..0ab10e0 100644 (file)
--- a/src/modules/dv/producer_libdv.c
+++ b/src/modules/dv/producer_libdv.c
@@ -79,6 +79,7 @@ dv_decoder_t *dv_decoder_alloc( )
                        this->quality = DV_QUALITY_COLOR | DV_QUALITY_AC_2;
                        this->audio->arg_audio_emphasis = 2;
                        dv_set_audio_correction( this, DV_AUDIO_CORRECT_AVERAGE );
+                       dv_set_error_log( this, NULL );
 
                        // Register it with the properties to ensure clean up
                        sprintf( label, "%p", this );
@@ -236,7 +237,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 +375,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 +421,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" ) );