diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-13 19:03:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-13 19:03:55 +0200 |
| commit | 684a9152c3b9d036c2a46c7ca3b772953e493de6 (patch) | |
| tree | c9defd5f71ba6209327e0062e5ba7547f7a5f894 | |
| parent | dffb85a98271826f6b38835b3c38399704bca3c0 (diff) | |
| parent | f0ce9913d0974ac0c7371a62c3324dd2863b5d1b (diff) | |
| download | ffmpeg-684a9152c3b9d036c2a46c7ca3b772953e493de6.tar.gz | |
Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'
* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
Rename tpel_template.c ---> pel_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264qpel_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/hpeldsp.c | 2 | ||||
| -rw-r--r-- | libavcodec/pel_template.c (renamed from libavcodec/tpel_template.c) | 6 | ||||
| -rw-r--r-- | libavcodec/qpeldsp.c | 2 | ||||
| -rw-r--r-- | libavcodec/tpeldsp.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h264qpel_template.c b/libavcodec/h264qpel_template.c index cb421b5309..4878c365a9 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 a7d1266092..7763760eb3 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 index 6e2502507b..6da7a56b2d 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 62ebcaa480..d9115d0e1d 100644 --- a/libavcodec/qpeldsp.c +++ b/libavcodec/qpeldsp.c @@ -36,7 +36,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 b5af72cac0..cc4fed328d 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) |