X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.h;h=9aa996c9f7b332a0d9d57e9f2b29a7a38667b553;hb=eabc3498604fc7983bbd805d40dad2e7df135f17;hp=18b1e608edb1e1e642e5bce7ac91b9e1c18b2ce0;hpb=f4d5357bbf35a289fb1516e5abc4bb65b589a138;p=melted

diff --git a/src/framework/mlt_frame.h b/src/framework/mlt_frame.h
index 18b1e60..9aa996c 100644
--- a/src/framework/mlt_frame.h
+++ b/src/framework/mlt_frame.h
@@ -81,6 +81,7 @@ extern uint8_t *mlt_frame_resize_yuv422( mlt_frame self, int owidth, int oheight
 extern uint8_t *mlt_frame_rescale_yuv422( mlt_frame self, int owidth, int oheight );
 extern void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight );
 extern int mlt_frame_mix_audio( mlt_frame self, mlt_frame that, float weight_start, float weight_end, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples  );
+extern int mlt_frame_combine_audio( mlt_frame self, mlt_frame that, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples  );
 extern int mlt_sample_calculator( float fps, int frequency, int64_t position );
 extern int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t position );