diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 20:38:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 20:38:39 +0100 |
| commit | baf3adc621feed563f0d12479519c600b26b768c (patch) | |
| tree | e04d8138656cea6bd03076f9877dc03a838a9339 /libavcodec/x86/dcadsp_init.c | |
| parent | 2cdbcc004837ce092a14f326f24d97a29512a2c3 (diff) | |
| parent | 08e3ea60ff4059341b74be04a428a38f7c3630b0 (diff) | |
| download | ffmpeg-baf3adc621feed563f0d12479519c600b26b768c.tar.gz | |
Merge commit '08e3ea60ff4059341b74be04a428a38f7c3630b0'
* commit '08e3ea60ff4059341b74be04a428a38f7c3630b0':
x86: synth filter float: implement SSE2 version
Conflicts:
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c
See: 2cdbcc004837ce092a14f326f24d97a29512a2c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dcadsp_init.c')
| -rw-r--r-- | libavcodec/x86/dcadsp_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/dcadsp_init.c b/libavcodec/x86/dcadsp_init.c index 06c31a0739..ca023bb5bb 100644 --- a/libavcodec/x86/dcadsp_init.c +++ b/libavcodec/x86/dcadsp_init.c @@ -66,7 +66,7 @@ static void synth_filter_sse2(FFTContext *imdct, ff_synth_filter_inner_sse2(synth_buf, synth_buf2, window, out, *synth_buf_offset, scale); - *synth_buf_offset= (*synth_buf_offset - 32)&511; + *synth_buf_offset = (*synth_buf_offset - 32) & 511; } av_cold void ff_synth_filter_init_x86(SynthFilterContext *s) |