From ade3ec8457f76a127e8f495ee73a2dee6cb80002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Mon, 10 Oct 2011 15:54:09 +0200 Subject: [PATCH] swresample: fix another broken indent chunk. Also use a consistent style inside that block. --- libswresample/resample2.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/libswresample/resample2.c b/libswresample/resample2.c index 73f536fa26..6510111182 100644 --- a/libswresample/resample2.c +++ b/libswresample/resample2.c @@ -203,25 +203,24 @@ AVResampleContext *swr_resample_init(AVResampleContext *c, int out_rate, int in_ double factor= FFMIN(out_rate * cutoff / in_rate, 1.0); int phase_count= 1<phase_shift!=phase_shift || c->linear!=linear || c->factor != factor - || c->filter_length!=FFMAX((int)ceil(filter_size/factor), 1)){ - c= av_mallocz(sizeof(AVResampleContext)); - if (!c) - return NULL; + if (!c || c->phase_shift != phase_shift || c->linear!=linear || c->factor != factor + || c->filter_length != FFMAX((int)ceil(filter_size/factor), 1)) { + c = av_mallocz(sizeof(AVResampleContext)); + if (!c) + return NULL; - c->phase_shift= phase_shift; - c->phase_mask= phase_count-1; - c->linear= linear; - c->factor= factor; - - c->filter_length= FFMAX((int)ceil(filter_size/factor), 1); - c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM)); - if (!c->filter_bank) - goto error; - if (build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM)); - c->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1]; + c->phase_shift = phase_shift; + c->phase_mask = phase_count - 1; + c->linear = linear; + c->factor = factor; + c->filter_length = FFMAX((int)ceil(filter_size/factor), 1); + c->filter_bank = av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM)); + if (!c->filter_bank) + goto error; + if (build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM)); + c->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1]; } c->compensation_distance= 0;