diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 10:18:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 10:18:46 +0200 |
| commit | eda9d97b7a1dcebc6684f88e4f6472e18bd6b9f0 (patch) | |
| tree | dd392912ac784cc1bffad9ce312dd058cd8e768b /libavcodec/x86/rnd_mmx.c | |
| parent | 56ba3312574fee02c037066aeed861a1be53f1cd (diff) | |
| parent | 46bb456853b197f4562de7acf5d42abf11ded9be (diff) | |
| download | ffmpeg-eda9d97b7a1dcebc6684f88e4f6472e18bd6b9f0.tar.gz | |
Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
x86: dsputil: Refactor pixels16 wrapper functions with a macro
Conflicts:
libavcodec/x86/hpeldsp_avg_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/rnd_mmx.c')
| -rw-r--r-- | libavcodec/x86/rnd_mmx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/x86/rnd_mmx.c b/libavcodec/x86/rnd_mmx.c index 4284e8b9da..db14135f52 100644 --- a/libavcodec/x86/rnd_mmx.c +++ b/libavcodec/x86/rnd_mmx.c @@ -29,4 +29,7 @@ #include "rnd_template.c" +PIXELS16(, ff_avg, , _xy2, _mmx) +PIXELS16(, ff_put, , _xy2, _mmx) + #endif /* HAVE_INLINE_ASM */ |