From ead3a2a37e67de617cad33b7e9bdb8ade6ed220f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 10 Jan 2013 00:25:09 +0100 Subject: swr: add noise_scale field to seperate it from the noise shaping scales Signed-off-by: Michael Niedermayer --- libswresample/dither.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libswresample/dither.c') diff --git a/libswresample/dither.c b/libswresample/dither.c index d7cb8a134a..c3bb5609ed 100644 --- a/libswresample/dither.c +++ b/libswresample/dither.c @@ -24,7 +24,7 @@ #include "noise_shaping_data.c" void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt) { - double scale = s->dither.ns_scale; + double scale = s->dither.noise_scale; #define TMP_EXTRA 2 double *tmp = av_malloc((len + TMP_EXTRA) * sizeof(double)); int i; @@ -95,6 +95,7 @@ int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFo scale *= s->dither.scale; s->dither.ns_pos = 0; + s->dither.noise_scale= scale; s->dither.ns_scale = scale; s->dither.ns_scale_1 = 1/scale; memset(s->dither.ns_errors, 0, sizeof(s->dither.ns_errors)); -- cgit v1.2.3