Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-03-09 08:16:08 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-03-09 20:16:55 +0400
commit9d40f7106dd56db611f85ca305396c20bd29e040 (patch)
treec9f68a18a961e2fd76e6f25c8ec8b610c4c6ff1c /libavcodec/h264qpel_template.c
parent9222978aed8b186d61ef527ef4ca736aca7ac1dc (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/h264qpel_template.c')
-rw-r--r--libavcodec/h264qpel_template.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/libavcodec/h264qpel_template.c b/libavcodec/h264qpel_template.c
index 95950f44dc..43fb21d7d9 100644
--- a/libavcodec/h264qpel_template.c
+++ b/libavcodec/h264qpel_template.c
@@ -531,30 +531,3 @@ H264_MC(avg_, 16)
#undef op_put
#undef op2_avg
#undef op2_put
-
-#if BIT_DEPTH == 8
-# define put_h264_qpel8_mc00_8_c ff_put_pixels8x8_8_c
-# define avg_h264_qpel8_mc00_8_c ff_avg_pixels8x8_8_c
-# define put_h264_qpel16_mc00_8_c ff_put_pixels16x16_8_c
-# define avg_h264_qpel16_mc00_8_c ff_avg_pixels16x16_8_c
-#elif BIT_DEPTH == 9
-# define put_h264_qpel8_mc00_9_c ff_put_pixels8x8_9_c
-# define avg_h264_qpel8_mc00_9_c ff_avg_pixels8x8_9_c
-# define put_h264_qpel16_mc00_9_c ff_put_pixels16x16_9_c
-# define avg_h264_qpel16_mc00_9_c ff_avg_pixels16x16_9_c
-#elif BIT_DEPTH == 10
-# define put_h264_qpel8_mc00_10_c ff_put_pixels8x8_10_c
-# define avg_h264_qpel8_mc00_10_c ff_avg_pixels8x8_10_c
-# define put_h264_qpel16_mc00_10_c ff_put_pixels16x16_10_c
-# define avg_h264_qpel16_mc00_10_c ff_avg_pixels16x16_10_c
-#elif BIT_DEPTH == 12
-# define put_h264_qpel8_mc00_12_c ff_put_pixels8x8_12_c
-# define avg_h264_qpel8_mc00_12_c ff_avg_pixels8x8_12_c
-# define put_h264_qpel16_mc00_12_c ff_put_pixels16x16_12_c
-# define avg_h264_qpel16_mc00_12_c ff_avg_pixels16x16_12_c
-#elif BIT_DEPTH == 14
-# define put_h264_qpel8_mc00_14_c ff_put_pixels8x8_14_c
-# define avg_h264_qpel8_mc00_14_c ff_avg_pixels8x8_14_c
-# define put_h264_qpel16_mc00_14_c ff_put_pixels16x16_14_c
-# define avg_h264_qpel16_mc00_14_c ff_avg_pixels16x16_14_c
-#endif