diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:26:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:26:23 +0100 |
| commit | 9d6a27d5336550c131d2a45fc4b0e90c93e46aca (patch) | |
| tree | 07fe3d8437eda2db2343a9d7d0932870e8018e8e /libavcodec/hpel_template.c | |
| parent | 74fed968d1b6f0aec9c08b9ac4fcad4314e0460a (diff) | |
| parent | 57f09608e1600d1cf1679885a46f5004d522d68f (diff) | |
| download | ffmpeg-9d6a27d5336550c131d2a45fc4b0e90c93e46aca.tar.gz | |
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
dsputil: Move thirdpel-related bits into their own context
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hpel_template.c')
| -rw-r--r-- | libavcodec/hpel_template.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/libavcodec/hpel_template.c b/libavcodec/hpel_template.c index 65bbd9b930..6695a65ac0 100644 --- a/libavcodec/hpel_template.c +++ b/libavcodec/hpel_template.c @@ -22,47 +22,6 @@ #include "pixels.h" #define DEF_HPEL(OPNAME, OP) \ -static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, \ - const uint8_t *pixels, \ - ptrdiff_t line_size, \ - int h) \ -{ \ - int i; \ - for (i = 0; i < h; i++) { \ - OP(*((pixel2 *) block), AV_RN2P(pixels)); \ - pixels += line_size; \ - block += line_size; \ - } \ -} \ - \ -static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, \ - const uint8_t *pixels, \ - ptrdiff_t line_size, \ - int h) \ -{ \ - int i; \ - for (i = 0; i < h; i++) { \ - OP(*((pixel4 *) block), AV_RN4P(pixels)); \ - pixels += line_size; \ - block += line_size; \ - } \ -} \ - \ -static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block, \ - const uint8_t *pixels, \ - ptrdiff_t line_size, \ - int h) \ -{ \ - int i; \ - for (i = 0; i < h; i++) { \ - OP(*((pixel4 *) block), AV_RN4P(pixels)); \ - OP(*((pixel4 *) (block + 4 * sizeof(pixel))), \ - AV_RN4P(pixels + 4 * sizeof(pixel))); \ - pixels += line_size; \ - block += line_size; \ - } \ -} \ - \ static inline void FUNC(OPNAME ## _pixels8_l2)(uint8_t *dst, \ const uint8_t *src1, \ const uint8_t *src2, \ @@ -134,10 +93,6 @@ static inline void FUNC(OPNAME ## _pixels16_l2)(uint8_t *dst, \ dst_stride, src_stride1, \ src_stride2, h); \ } \ - \ -CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16), \ - FUNCC(OPNAME ## _pixels8), \ - 8 * sizeof(pixel)) #define op_avg(a, b) a = rnd_avg_pixel4(a, b) #define op_put(a, b) a = b |