From f9a2c5bc07fbcc6fa5bb6b53d3abe6ea3c0e3002 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 11 Apr 2012 09:57:38 +0200 Subject: swr: simplify code by using av_get_bytes_per_sample() Signed-off-by: Michael Niedermayer --- libswresample/rematrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libswresample/rematrix.c') diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 845f854335..44319792ea 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -290,7 +290,7 @@ 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 * (s->int_sample_fmt == AV_SAMPLE_FMT_FLT ? sizeof(float) : sizeof(int16_t))); + 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]; -- cgit v1.2.3