RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f' 

* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-26 14:32:12 +01:00
parent 8e8347b892 d3c3c1664a
commit 152c8fd856
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/dsputil.c
View File

@ -50,6 +50,7 @@ uint32_t ff_square_tab[512] = { 0, };
#undef BIT_DEPTH
#define BIT_DEPTH 8
#include "hpel_template.c"
#include "tpel_template.c"
#include "dsputil_template.c"

4
libavcodec/dsputil_template.c
View File

@ -97,10 +97,6 @@ static void FUNCC(clear_blocks)(int16_t *blocks)
}
#endif
#if BIT_DEPTH == 8
#include "hpel_template.c"
#endif
#define PIXOP2(OPNAME, OP) \
static inline void FUNC(OPNAME ## _no_rnd_pixels8_l2)(uint8_t *dst, \
const uint8_t *src1, \

2
libavcodec/hpel_template.c
View File

@ -21,6 +21,8 @@
#include "pixels.h"
#include "bit_depth_template.c"
#define DEF_HPEL(OPNAME, OP) \
static inline void FUNC(OPNAME ## _pixels8_l2)(uint8_t *dst, \
const uint8_t *src1, \