X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_mix.c;h=d6f8b2a70bf44ec998c12e450eaad383cc6370c5;hb=3544a004b42ec88fa0d1ef95733b875d7071ffcf;hp=e9763875d2ffc44bc563ccbedee9a7753b172628;hpb=978543a20e47302b82bc29007852bff8180031c2;p=melted diff --git a/src/modules/core/transition_mix.c b/src/modules/core/transition_mix.c index e976387..d6f8b2a 100644 --- a/src/modules/core/transition_mix.c +++ b/src/modules/core/transition_mix.c @@ -34,7 +34,7 @@ static int transition_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_fo mlt_properties a_props = mlt_frame_properties( frame ); // Get the b frame from the stack - mlt_frame b_frame = mlt_frame_pop_frame( frame ); + mlt_frame b_frame = mlt_frame_pop_audio( frame ); // Get the properties of the b frame mlt_properties b_props = mlt_frame_properties( b_frame ); @@ -56,9 +56,6 @@ static int transition_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_fo mlt_frame_mix_audio( frame, b_frame, mix_start, mix_end, buffer, format, frequency, channels, samples ); - // Push the b_frame back on for get_image - mlt_frame_push_frame( frame, b_frame ); - return 0; } @@ -116,7 +113,7 @@ static mlt_frame transition_process( mlt_transition this, mlt_frame a_frame, mlt // Override the get_audio method a_frame->get_audio = transition_get_audio; - mlt_frame_push_frame( a_frame, b_frame ); + mlt_frame_push_audio( a_frame, b_frame ); return a_frame; }