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/h264qpel_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/h264qpel_template.c')
| -rw-r--r-- | libavcodec/h264qpel_template.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264qpel_template.c b/libavcodec/h264qpel_template.c index 37c48a991d..cb421b5309 100644 --- a/libavcodec/h264qpel_template.c +++ b/libavcodec/h264qpel_template.c @@ -24,6 +24,7 @@ #include "bit_depth_template.c" #include "hpel_template.c" +#include "tpel_template.c" static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h) { |