diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-08 20:16:08 -0800 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-04-10 10:59:14 +0300 |
| commit | 6d25c9db11e87ec58652de6588448225137b0c57 (patch) | |
| tree | 14680d76800e4f7ac20ad462f1cbd7a48d09d251 /libavcodec/dsputil_template.c | |
| parent | 2e81acc687e64d15dd93c74793060bb5a233f44d (diff) | |
| download | android_external_ffmpeg-6d25c9db11e87ec58652de6588448225137b0c57.tar.gz android_external_ffmpeg-6d25c9db11e87ec58652de6588448225137b0c57.tar.bz2 android_external_ffmpeg-6d25c9db11e87ec58652de6588448225137b0c57.zip | |
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).
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/dsputil_template.c')
| -rw-r--r-- | libavcodec/dsputil_template.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 619404cb92..d232d51489 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,20 +422,3 @@ PIXOP2(put, op_put) #endif #undef op_avg #undef op_put - -void FUNCC(ff_put_pixels8x8)(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - FUNCC(put_pixels8)(dst, src, stride, 8); -} -void FUNCC(ff_avg_pixels8x8)(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - FUNCC(avg_pixels8)(dst, src, stride, 8); -} -void FUNCC(ff_put_pixels16x16)(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - FUNCC(put_pixels16)(dst, src, stride, 16); -} -void FUNCC(ff_avg_pixels16x16)(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - FUNCC(avg_pixels16)(dst, src, stride, 16); -} |