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_template.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_template.c')
| -rw-r--r-- | libavcodec/x86/rnd_template.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/x86/rnd_template.c b/libavcodec/x86/rnd_template.c index 68cd341aae..e37fc19506 100644 --- a/libavcodec/x86/rnd_template.c +++ b/libavcodec/x86/rnd_template.c @@ -171,18 +171,3 @@ STATIC void DEF(avg, pixels8_xy2)(uint8_t *block, const uint8_t *pixels, :"D"(block), "r"((x86_reg)line_size) :REG_a, "memory"); } - -//FIXME optimize -STATIC void DEF(put, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h) -{ - DEF(put, pixels8_xy2)(block , pixels , line_size, h); - DEF(put, pixels8_xy2)(block+8, pixels+8, line_size, h); -} - -STATIC void DEF(avg, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h) -{ - DEF(avg, pixels8_xy2)(block , pixels , line_size, h); - DEF(avg, pixels8_xy2)(block+8, pixels+8, line_size, h); -} |