From: Michael Niedermayer Date: Sat, 9 Jun 2012 00:06:58 +0000 (+0200) Subject: swr: skip memset(0) in rematrix when the array is known to be already 0 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a5c634935891ed8a45603bfa676d053d3e6a8a04;p=ffmpeg swr: skip memset(0) in rematrix when the array is known to be already 0 Signed-off-by: Michael Niedermayer --- diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 96246275b20..5fa77ce5f9f 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -362,7 +362,8 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus for(out_i=0; out_ich_count; out_i++){ switch(s->matrix_ch[out_i][0]){ case 0: - memset(out->ch[out_i], 0, len * av_get_bytes_per_sample(s->int_sample_fmt)); + if(mustcopy) + memset(out->ch[out_i], 0, len * av_get_bytes_per_sample(s->int_sample_fmt)); break; case 1: in_i= s->matrix_ch[out_i][1];