diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:52:21 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 17:52:21 +0100 |
commit | 6d1e9d993a5559ca5c4a578fce499c74528fe8d1 (patch) | |
tree | e0bb88a7451876b192ef4254a6e3320ff75d260c /libavcodec/x86/dsputil_rnd_template.c | |
parent | ac8987591f5503768e7587c25693928f26fcb3d1 (diff) | |
parent | 32ff6432284f713e9f837ee5b36fc8e9f1902836 (diff) |
Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
dsputil: remove avg_no_rnd_pixels8.
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_rnd_template.c')
-rw-r--r-- | libavcodec/x86/dsputil_rnd_template.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/x86/dsputil_rnd_template.c b/libavcodec/x86/dsputil_rnd_template.c index e4c91381fa..c4790af5b7 100644 --- a/libavcodec/x86/dsputil_rnd_template.c +++ b/libavcodec/x86/dsputil_rnd_template.c @@ -317,6 +317,7 @@ static void av_unused DEF(avg, pixels4)(uint8_t *block, const uint8_t *pixels, i while (--h); } +#ifndef NO_RND // in case more speed is needed - unroling would certainly help static void DEF(avg, pixels8)(uint8_t *block, const uint8_t *pixels, int line_size, int h) { @@ -336,6 +337,7 @@ static void DEF(avg, pixels8)(uint8_t *block, const uint8_t *pixels, int line_si } while (--h); } +#endif // NO_RND static void DEF(avg, pixels16)(uint8_t *block, const uint8_t *pixels, int line_size, int h) { @@ -360,6 +362,7 @@ static void DEF(avg, pixels16)(uint8_t *block, const uint8_t *pixels, int line_s while (--h); } +#ifndef NO_RND static void DEF(avg, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h) { MOVQ_BFE(mm6); @@ -379,6 +382,7 @@ static void DEF(avg, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line block += line_size; } while (--h); } +#endif // NO_RND static av_unused void DEF(avg, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h) { |