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.c | |
| parent | 9222978aed8b186d61ef527ef4ca736aca7ac1dc (diff) | |
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.c')
| -rw-r--r-- | libavcodec/dsputil.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 12cfb1b216..f860e498e7 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -1297,12 +1297,25 @@ QPEL_MC(0, avg_ , _ , op_avg) #undef op_put #undef op_put_no_rnd +void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, int stride) { + put_pixels8_8_c(dst, src, stride, 8); +} +void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, int stride) { + avg_pixels8_8_c(dst, src, stride, 8); +} +void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, int stride) { + put_pixels16_8_c(dst, src, stride, 16); +} +void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, int stride) { + avg_pixels16_8_c(dst, src, stride, 16); +} + #define put_qpel8_mc00_c ff_put_pixels8x8_c #define avg_qpel8_mc00_c ff_avg_pixels8x8_c #define put_qpel16_mc00_c ff_put_pixels16x16_c #define avg_qpel16_mc00_c ff_avg_pixels16x16_c #define put_no_rnd_qpel8_mc00_c ff_put_pixels8x8_c -#define put_no_rnd_qpel16_mc00_c ff_put_pixels16x16_8_c +#define put_no_rnd_qpel16_mc00_c ff_put_pixels16x16_c static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; |