diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 13:07:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 13:07:20 +0200 |
| commit | 2288c776897076a5f7f5cc772836592798160423 (patch) | |
| tree | 0f85650aaad1909389c64a0917ea5d5a6065f37e | |
| parent | e4c0f258d38a961aff463c8474936771be7c561e (diff) | |
| parent | 311a592dfcfc20b601a592472b36593351cf32c3 (diff) | |
| download | ffmpeg-2288c776897076a5f7f5cc772836592798160423.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Remove some duplicate function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/hpeldsp_init.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index cc74c83af5..7e16592b6c 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -70,8 +70,6 @@ void ff_avg_pixels16_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h); void ff_put_no_rnd_pixels16_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h); -void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); static void ff_put_pixels16_mmxext(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index d4d5b2043c..c9bdf8242d 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -284,11 +284,6 @@ static void put_pixels16_mmx(uint8_t *block, const uint8_t *pixels, } #endif /* HAVE_INLINE_ASM */ -void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); - #define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU) \ do { \ c->PFX ## _pixels_tab IDX [0] = PFX ## _pixels ## SIZE ## _ ## CPU; \ |