diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-01-27 14:27:04 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-03-22 06:17:29 -0700 |
| commit | 600b854ad8173995518bd917e7f86120b5505088 (patch) | |
| tree | f9647bc56cf7a6a6ada327dc2631b029eb7c17bf | |
| parent | 1a8d0cf77ed2611e542ae98f341d4c43a04467bd (diff) | |
| download | ffmpeg-600b854ad8173995518bd917e7f86120b5505088.tar.gz | |
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
| -rw-r--r-- | libavcodec/imgconvert.c | 4 | ||||
| -rw-r--r-- | libavcodec/imgconvert.h | 18 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_x86.h | 12 |
3 files changed, 18 insertions, 16 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 3f5d035ee4..3f65c5b7cc 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -40,10 +40,6 @@ #include "libavutil/imgutils.h" #if HAVE_MMX_EXTERNAL -#include "x86/dsputil_x86.h" -#endif - -#if HAVE_MMX_EXTERNAL #define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx #define deinterlace_line ff_deinterlace_line_mmx #else diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h index 91e9f91244..56d89b2df0 100644 --- a/libavcodec/imgconvert.h +++ b/libavcodec/imgconvert.h @@ -21,6 +21,24 @@ #include <stdint.h> +#include "version.h" + +#if FF_API_DEINTERLACE + +void ff_deinterlace_line_mmx(uint8_t *dst, + const uint8_t *lum_m4, const uint8_t *lum_m3, + const uint8_t *lum_m2, const uint8_t *lum_m1, + const uint8_t *lum, + int size); + +void ff_deinterlace_line_inplace_mmx(const uint8_t *lum_m4, + const uint8_t *lum_m3, + const uint8_t *lum_m2, + const uint8_t *lum_m1, + const uint8_t *lum, int size); + +#endif /* FF_API_DEINTERLACE */ + /* 1/2^n downscaling functions */ void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h index 4b615233bf..41562e7510 100644 --- a/libavcodec/x86/dsputil_x86.h +++ b/libavcodec/x86/dsputil_x86.h @@ -91,18 +91,6 @@ void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels, void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); -void ff_deinterlace_line_mmx(uint8_t *dst, - const uint8_t *lum_m4, const uint8_t *lum_m3, - const uint8_t *lum_m2, const uint8_t *lum_m1, - const uint8_t *lum, - int size); - -void ff_deinterlace_line_inplace_mmx(const uint8_t *lum_m4, - const uint8_t *lum_m3, - const uint8_t *lum_m2, - const uint8_t *lum_m1, - const uint8_t *lum, int size); - #define PIXELS16(STATIC, PFX1, PFX2, TYPE, CPUEXT) \ STATIC void PFX1 ## _pixels16 ## TYPE ## CPUEXT(uint8_t *block, \ const uint8_t *pixels, \ |