diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 22:28:38 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 22:35:07 +0100 |
| commit | 83cd80d10aebd1bde7310ab3d058134d0642a6bb (patch) | |
| tree | ce0aa14de18b3c8745924d2fa88a2927c85d6c3d /libavcodec/audiodsp.c | |
| parent | bbc3bde14f1402a68c64a28edc347464554589cb (diff) | |
| parent | 12004a9a7f20e44f4da2ee6c372d5e1794c8d6c5 (diff) | |
Merge commit '12004a9a7f20e44f4da2ee6c372d5e1794c8d6c5'
* commit '12004a9a7f20e44f4da2ee6c372d5e1794c8d6c5':
audiodsp/x86: yasmify vector_clipf_sse
audiodsp: reorder arguments for vector_clipf
Merged the version from Libav after a discussion with James Almer on
IRC:
19:22 <ubitux> jamrial: opinion on 12004a9a7f20e44f4da2ee6c372d5e1794c8d6c5?
19:23 <ubitux> it was apparently yasmified differently
19:23 <ubitux> (it depends on the previous commit arg shuffle)
19:24 <ubitux> i don't see the magic movsxdifnidn in your port btw
19:24 <ubitux> it's a port from 1d36defe94c7d7ebf995d4dbb4f878d06272f9c6
19:25 <jamrial> seems better thanks to said arg shuffle
19:25 <jamrial> the loop is the same, but init is simpler
19:25 <jamrial> probably worth merging
19:25 <ubitux> OK
19:25 <ubitux> thanks
19:26 <jamrial> curious they didn't make len ptrdiff_t after the previous bunch of commits, heh
19:26 <ubitux> yeah indeed
Both commits are merged at the same time to prevent a conflict with our
existing yasmified ff_vector_clipf_sse.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/audiodsp.c')
| -rw-r--r-- | libavcodec/audiodsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/audiodsp.c b/libavcodec/audiodsp.c index 85b5a74947..3c7a3a7583 100644 --- a/libavcodec/audiodsp.c +++ b/libavcodec/audiodsp.c @@ -55,8 +55,8 @@ static void vector_clipf_c_opposite_sign(float *dst, const float *src, } } -static void vector_clipf_c(float *dst, const float *src, - float min, float max, int len) +static void vector_clipf_c(float *dst, const float *src, int len, + float min, float max) { int i; |