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 /libavcodec/x86/hpeldsp_init.c | |
| 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>
Diffstat (limited to 'libavcodec/x86/hpeldsp_init.c')
| -rw-r--r-- | libavcodec/x86/hpeldsp_init.c | 5 |
1 files changed, 0 insertions, 5 deletions
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; \ |