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.h | |
| parent | 2e81acc687e64d15dd93c74793060bb5a233f44d (diff) | |
| download | ffmpeg-6d25c9db11e87ec58652de6588448225137b0c57.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).
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 3ef74caf05..2a7c014fe3 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -49,20 +49,10 @@ extern const uint8_t ff_zigzag248_direct[64]; extern uint32_t ff_squareTbl[512]; extern const uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP]; -#define PUTAVG_PIXELS(depth)\ -void ff_put_pixels8x8_ ## depth ## _c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);\ -void ff_avg_pixels8x8_ ## depth ## _c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);\ -void ff_put_pixels16x16_ ## depth ## _c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);\ -void ff_avg_pixels16x16_ ## depth ## _c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); - -PUTAVG_PIXELS( 8) -PUTAVG_PIXELS( 9) -PUTAVG_PIXELS(10) - -#define ff_put_pixels8x8_c ff_put_pixels8x8_8_c -#define ff_avg_pixels8x8_c ff_avg_pixels8x8_8_c -#define ff_put_pixels16x16_c ff_put_pixels16x16_8_c -#define ff_avg_pixels16x16_c ff_avg_pixels16x16_8_c +void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); +void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); +void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); +void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); /* RV40 functions */ void ff_put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); |