RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swresample: fix another broken indent chunk. 

Also use a consistent style inside that block.
This commit is contained in:
Clément Bœsch 2011-10-10 15:54:09 +02:00 committed by Clément Bœsch
parent b2f88ce21c
commit ade3ec8457
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libswresample/resample2.c
View File

@ -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); double factor= FFMIN(out_rate * cutoff / in_rate, 1.0);
int phase_count= 1<<phase_shift; int phase_count= 1<<phase_shift;
if(!c || c->phase_shift!=phase_shift || c->linear!=linear || c->factor != factor if (!c || c->phase_shift != phase_shift || c->linear!=linear || c->factor != factor
|| c->filter_length!=FFMAX((int)ceil(filter_size/factor), 1)){ || c->filter_length != FFMAX((int)ceil(filter_size/factor), 1)) {
c= av_mallocz(sizeof(AVResampleContext)); c = av_mallocz(sizeof(AVResampleContext));
if (!c) if (!c)
return NULL; return NULL;
c->phase_shift= phase_shift; c->phase_shift = phase_shift;
c->phase_mask= phase_count-1; c->phase_mask = phase_count - 1;
c->linear= linear; c->linear = linear;
c->factor= factor; c->factor = factor;
c->filter_length = FFMAX((int)ceil(filter_size/factor), 1);
c->filter_length= FFMAX((int)ceil(filter_size/factor), 1); c->filter_bank = av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM));
c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM)); if (!c->filter_bank)
if (!c->filter_bank) goto error;
goto error; if (build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, WINDOW_TYPE))
if (build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, WINDOW_TYPE)) goto error;
goto error; memcpy(&c->filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM));
memcpy(&c->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->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1];
} }
c->compensation_distance= 0; c->compensation_distance= 0;