X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=a51fb7e68896e60e903843c81c73a7e674db5f8e;hb=1a9a79e5767660719d02f7683cebcc03953340a7;hp=64ec68dfd194c8c96c26f2e99d380ad0c024f6f6;hpb=f5778b64f410f048403d510c1f950e3ac5132734;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 64ec68d..a51fb7e 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -245,7 +245,7 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for *channels = 2; if ( *frequency <= 0 ) *frequency = 48000; - if ( test_card.afmt != *format ) + if ( test_card.audio == NULL || test_card.afmt != *format ) { test_card.afmt = *format; test_card.audio = realloc( test_card.audio, *samples * *channels * sizeof( int16_t ) ); @@ -701,7 +701,7 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t * int ret = 0; int16_t *p_src, *p_dest; int16_t *src, *dest; - static int16_t *extra_src = NULL, *extra_dest = NULL; + //static int16_t *extra_src = NULL, *extra_dest = NULL; static int extra_src_samples = 0, extra_dest_samples = 0; int frequency_src = 0, frequency_dest = 0; int channels_src = 0, channels_dest = 0;