diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-08 20:16:08 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-09 17:16:55 +0100 |
| commit | 9d40f7106dd56db611f85ca305396c20bd29e040 (patch) | |
| tree | c9f68a18a961e2fd76e6f25c8ec8b610c4c6ff1c /libavcodec/dsputil_template.c | |
| parent | 9222978aed8b186d61ef527ef4ca736aca7ac1dc (diff) | |
| download | ffmpeg-9d40f7106dd56db611f85ca305396c20bd29e040.tar.gz | |
dsputil: make square put/avg_pixels functions local to h264qpel.
Put a copy of the 8bit functions only in dsputil, where they are used
for some other things (e.g. mpeg4qpel, mspel, cavsqpel). We could perhaps
also try to share specifically the 8bit functions from h264qpel between
it and the others, but that will be slightly more complicated. H264qpel
already had these functions, so we can simply remove the duplicates.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil_template.c')
| -rw-r--r-- | libavcodec/dsputil_template.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 8517ded4ee..246d6c4a52 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -107,7 +107,9 @@ DCTELEM_FUNCS(int16_t, _16) DCTELEM_FUNCS(dctcoef, _32) #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, const uint8_t *src2, int dst_stride, \ @@ -420,17 +422,3 @@ PIXOP2(put, op_put) #endif #undef op_avg #undef op_put - -void FUNCC(ff_put_pixels8x8)(uint8_t *dst, uint8_t *src, int stride) { - FUNCC(put_pixels8)(dst, src, stride, 8); -} -void FUNCC(ff_avg_pixels8x8)(uint8_t *dst, uint8_t *src, int stride) { - FUNCC(avg_pixels8)(dst, src, stride, 8); -} -void FUNCC(ff_put_pixels16x16)(uint8_t *dst, uint8_t *src, int stride) { - FUNCC(put_pixels16)(dst, src, stride, 16); -} -void FUNCC(ff_avg_pixels16x16)(uint8_t *dst, uint8_t *src, int stride) { - FUNCC(avg_pixels16)(dst, src, stride, 16); -} - |