diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 16:55:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 16:55:46 +0100 |
| commit | 4998a72b497fd4b658887aebb3a2240aefe1fc81 (patch) | |
| tree | 66518825972a9eb6227ab2da22878933e32fb148 /libavcodec/x86/hpeldsp_init.c | |
| parent | b7f0d39d2629f0a1854adbda74c434a0754e9fa1 (diff) | |
| parent | efc7290eb668ce77ef28d0ab9958024d0a35fbe8 (diff) | |
| download | ffmpeg-4998a72b497fd4b658887aebb3a2240aefe1fc81.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init
Conflicts:
libavcodec/x86/rnd_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/hpeldsp_init.c')
| -rw-r--r-- | libavcodec/x86/hpeldsp_init.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index c945c50481..f860533f7e 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -128,6 +128,12 @@ CALL_2X_PIXELS(put_no_rnd_pixels16_xy2_mmx, put_no_rnd_pixels8_xy2_mmx, 8) #include "hpeldsp_rnd_template.c" #undef DEF +#define DEF(x, y) ff_ ## x ## _ ## y ## _mmx +#define STATIC + +#include "rnd_template.c" + +#undef DEF #undef SET_RND #undef PAVGBP #undef PAVGB @@ -135,6 +141,9 @@ CALL_2X_PIXELS(put_no_rnd_pixels16_xy2_mmx, put_no_rnd_pixels8_xy2_mmx, 8) CALL_2X_PIXELS(avg_pixels16_y2_mmx, avg_pixels8_y2_mmx, 8) CALL_2X_PIXELS(put_pixels16_y2_mmx, put_pixels8_y2_mmx, 8) +CALL_2X_PIXELS_EXPORT(ff_avg_pixels16_xy2_mmx, ff_avg_pixels8_xy2_mmx, 8) +CALL_2X_PIXELS_EXPORT(ff_put_pixels16_xy2_mmx, ff_put_pixels8_xy2_mmx, 8) + #endif /* HAVE_INLINE_ASM */ |