diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 20:05:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 20:07:00 +0200 |
| commit | 82edf6727f0663601351081ca1e4fb20d1752972 (patch) | |
| tree | 12479c3ec8cedfa0ec4dda38a72023224f2b5b73 /libavcodec/x86/snowdsp_mmx.c | |
| parent | f87dacb27de93f995cb18f9dcc73581ef8fc157b (diff) | |
| parent | f61ce90caa909d131ea6ec205823568a38115529 (diff) | |
| download | ffmpeg-82edf6727f0663601351081ca1e4fb20d1752972.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs
lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs
Add Dolby/DPLII downmix support to libavresample
vorbisdec: replace div/mod in loop with a counter
fate: vorbis: add 5.1 surround test
rtpenc: Allow requesting H264 RTP packetization mode 0
configure: Sort the library listings in the help text alphabetically
dwt: remove variable-length arrays
RTMPT protocol support
http: Properly handle chunked transfer-encoding for replies to post data
http: Fail reading if the connection has gone away
amr: Mark an array const
amr: More space cleanup
rtpenc: Fix memory leaks in the muxer open function
Conflicts:
Changelog
configure
doc/APIchanges
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/snowdsp_mmx.c')
| -rw-r--r-- | libavcodec/x86/snowdsp_mmx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/x86/snowdsp_mmx.c b/libavcodec/x86/snowdsp_mmx.c index f107d55e87..f340a868be 100644 --- a/libavcodec/x86/snowdsp_mmx.c +++ b/libavcodec/x86/snowdsp_mmx.c @@ -26,9 +26,8 @@ #include "libavcodec/dwt.h" #include "dsputil_mmx.h" -static void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){ +static void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, IDWTELEM *temp, int width){ const int w2= (width+1)>>1; - DECLARE_ALIGNED(16, IDWTELEM, temp)[width>>1]; const int w_l= (width>>1); const int w_r= w2 - 1; int i; @@ -215,9 +214,8 @@ static void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){ } } -static void ff_snow_horizontal_compose97i_mmx(IDWTELEM *b, int width){ +static void ff_snow_horizontal_compose97i_mmx(IDWTELEM *b, IDWTELEM *temp, int width){ const int w2= (width+1)>>1; - IDWTELEM temp[width >> 1]; const int w_l= (width>>1); const int w_r= w2 - 1; int i; |