diff --git a/libavcodec/h264qpel_template.c b/libavcodec/h264qpel_template.c index d03b0dc443..963f7f1ae2 100644 --- a/libavcodec/h264qpel_template.c +++ b/libavcodec/h264qpel_template.c @@ -24,7 +24,7 @@ #include "bit_depth_template.c" #include "hpel_template.c" -#include "tpel_template.c" +#include "pel_template.c" static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h) { diff --git a/libavcodec/hpeldsp.c b/libavcodec/hpeldsp.c index 16f4c772ee..25694c5940 100644 --- a/libavcodec/hpeldsp.c +++ b/libavcodec/hpeldsp.c @@ -33,7 +33,7 @@ #define BIT_DEPTH 8 #include "hpel_template.c" -#include "tpel_template.c" +#include "pel_template.c" #define PIXOP2(OPNAME, OP) \ static inline void OPNAME ## _no_rnd_pixels8_l2_8(uint8_t *dst, \ diff --git a/libavcodec/tpel_template.c b/libavcodec/pel_template.c similarity index 97% rename from libavcodec/tpel_template.c rename to libavcodec/pel_template.c index f07679a88f..b832ae7624 100644 --- a/libavcodec/tpel_template.c +++ b/libavcodec/pel_template.c @@ -25,7 +25,7 @@ #include "bit_depth_template.c" -#define DEF_TPEL(OPNAME, OP) \ +#define DEF_PEL(OPNAME, OP) \ static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, \ const uint8_t *pixels, \ ptrdiff_t line_size, \ @@ -74,7 +74,7 @@ CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16), \ #define op_avg(a, b) a = rnd_avg_pixel4(a, b) #define op_put(a, b) a = b -DEF_TPEL(avg, op_avg) -DEF_TPEL(put, op_put) +DEF_PEL(avg, op_avg) +DEF_PEL(put, op_put) #undef op_avg #undef op_put diff --git a/libavcodec/qpeldsp.c b/libavcodec/qpeldsp.c index 7b51ce2d1d..d5afac783c 100644 --- a/libavcodec/qpeldsp.c +++ b/libavcodec/qpeldsp.c @@ -33,7 +33,7 @@ #define BIT_DEPTH 8 #include "hpel_template.c" -#include "tpel_template.c" +#include "pel_template.c" #include "qpel_template.c" #define QPEL_MC(r, OPNAME, RND, OP) \ diff --git a/libavcodec/tpeldsp.c b/libavcodec/tpeldsp.c index 6a1681311a..7ea1da4f7e 100644 --- a/libavcodec/tpeldsp.c +++ b/libavcodec/tpeldsp.c @@ -29,7 +29,7 @@ #include "tpeldsp.h" #define BIT_DEPTH 8 -#include "tpel_template.c" +#include "pel_template.c" static inline void put_tpel_pixels_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int width, int height)