diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-30 08:42:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-30 08:42:10 +0200 |
| commit | 01a5a3a2e8ace103cc62e2c332cb78da253b5ca8 (patch) | |
| tree | 765d9782095ea92b7b0f647d478f28eee6eca696 | |
| parent | a3030d47e77105d3f178facd60cb138ae9fce2ad (diff) | |
| parent | 97c56ad7961ebb463dc9f76fe30b96966ad13864 (diff) | |
| download | ffmpeg-01a5a3a2e8ace103cc62e2c332cb78da253b5ca8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Remove a set of pointless #ifs around function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 2fe73a33cb..a8eeba83ef 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -56,7 +56,6 @@ DECLARE_ALIGNED(16, const double, ff_pd_1)[2] = { 1.0, 1.0 }; DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 }; -#if HAVE_YASM void ff_put_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h); void ff_put_no_rnd_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, @@ -98,7 +97,6 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src, int dstStride, int srcStride); #define ff_put_no_rnd_pixels16_mmxext ff_put_pixels16_mmxext #define ff_put_no_rnd_pixels8_mmxext ff_put_pixels8_mmxext -#endif /* HAVE_YASM */ #if HAVE_INLINE_ASM |