X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libswresample%2Frematrix_template.c;h=b3ed87e65f678e83071bbbb0f6ba93733223edf9;hb=fa838a0c0f42246623c4501c6b197e16ee9713b4;hp=f83825d5ec92c198fc66f99c6fe1fd0fffa43dae;hpb=cabbd271a5f37042291c06b9f8bd6c641fbddfde;p=ffmpeg diff --git a/libswresample/rematrix_template.c b/libswresample/rematrix_template.c index f83825d5ec9..b3ed87e65f6 100644 --- a/libswresample/rematrix_template.c +++ b/libswresample/rematrix_template.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +typedef void (RENAME(mix_any_func_type))(SAMPLE **out, const SAMPLE **in1, COEFF *coeffp, int len); static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, COEFF *coeffp, int index1, int index2, int len){ int i; @@ -55,7 +56,7 @@ static void RENAME(mix8to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, int } } -static mix_any_func_type *RENAME(get_mix_any_func)(SwrContext *s){ +static RENAME(mix_any_func_type) *RENAME(get_mix_any_func)(SwrContext *s){ if( s->out_ch_layout == AV_CH_LAYOUT_STEREO && (s->in_ch_layout == AV_CH_LAYOUT_5POINT1 || s->in_ch_layout == AV_CH_LAYOUT_5POINT1_BACK) && s->matrix[0][2] == s->matrix[1][2] && s->matrix[0][3] == s->matrix[1][3] && !s->matrix[0][1] && !s->matrix[0][5] && !s->matrix[1][0] && !s->matrix[1][4]