diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-13 21:03:47 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-13 21:03:55 +0400 |
| commit | 684a9152c3b9d036c2a46c7ca3b772953e493de6 (patch) | |
| tree | c9defd5f71ba6209327e0062e5ba7547f7a5f894 /libavcodec/h264qpel_template.c | |
| parent | dffb85a98271826f6b38835b3c38399704bca3c0 (diff) | |
| parent | f0ce9913d0974ac0c7371a62c3324dd2863b5d1b (diff) | |
Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'
* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
Rename tpel_template.c ---> pel_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264qpel_template.c')
| -rw-r--r-- | libavcodec/h264qpel_template.c | 2 |
1 files changed, 1 insertions, 1 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) { |