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 /libavcodec/tpeldsp.c | |
| 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>
Diffstat (limited to 'libavcodec/tpeldsp.c')
| -rw-r--r-- | libavcodec/tpeldsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |