aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dsputil.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-07-18 16:43:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-07-18 16:43:46 +0200
commit3c3daf4d198306295e3342631f19422bdc258dbb (patch)
tree96087928a24b17dbd893c7ab5dfa5f45a76de4ae /libavcodec/dsputil.c
parent93263dc19e441f347baf9c36b5bc83693f16d084 (diff)
parent9bc8bcddbd4fc394e2268e9849dcbf3bad6de980 (diff)
downloadffmpeg-3c3daf4d198306295e3342631f19422bdc258dbb.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h dsputil: remove disabled code tta: remove disabled code gxfenc: place variable declarations before statements x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template random_seed: use proper #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r--libavcodec/dsputil.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 21b6c7143a..162a36e8aa 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -174,16 +174,6 @@ static int pix_norm1_c(uint8_t * pix, int line_size)
s = 0;
for (i = 0; i < 16; i++) {
for (j = 0; j < 16; j += 8) {
-#if 0
- s += sq[pix[0]];
- s += sq[pix[1]];
- s += sq[pix[2]];
- s += sq[pix[3]];
- s += sq[pix[4]];
- s += sq[pix[5]];
- s += sq[pix[6]];
- s += sq[pix[7]];
-#else
#if LONG_MAX > 2147483647
register uint64_t x=*(uint64_t*)pix;
s += sq[x&0xff];
@@ -206,7 +196,6 @@ static int pix_norm1_c(uint8_t * pix, int line_size)
s += sq[(x>>16)&0xff];
s += sq[(x>>24)&0xff];
#endif
-#endif
pix += 8;
}
pix += line_size - 16;
@@ -818,27 +807,6 @@ static inline void avg_tpel_pixels_mc22_c(uint8_t *dst, const uint8_t *src, int
dst += stride;
}
}
-#if 0
-#define TPEL_WIDTH(width)\
-static void put_tpel_pixels ## width ## _mc00_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc00_c(dst, src, stride, width, height);}\
-static void put_tpel_pixels ## width ## _mc10_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc10_c(dst, src, stride, width, height);}\
-static void put_tpel_pixels ## width ## _mc20_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc20_c(dst, src, stride, width, height);}\
-static void put_tpel_pixels ## width ## _mc01_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc01_c(dst, src, stride, width, height);}\
-static void put_tpel_pixels ## width ## _mc11_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc11_c(dst, src, stride, width, height);}\
-static void put_tpel_pixels ## width ## _mc21_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc21_c(dst, src, stride, width, height);}\
-static void put_tpel_pixels ## width ## _mc02_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc02_c(dst, src, stride, width, height);}\
-static void put_tpel_pixels ## width ## _mc12_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc12_c(dst, src, stride, width, height);}\
-static void put_tpel_pixels ## width ## _mc22_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
- void put_tpel_pixels_mc22_c(dst, src, stride, width, height);}
-#endif
#define QPEL_MC(r, OPNAME, RND, OP) \
static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\