On Fri, 14 Mar 2014 05:42:22 -0700, Diego Biurrun <[email protected]> wrote:
> ---
>  libavcodec/imgconvert.c      |  4 ----
>  libavcodec/imgconvert.h      | 18 ++++++++++++++++++
>  libavcodec/x86/dsputil_x86.h | 12 ------------
>  3 files changed, 18 insertions(+), 16 deletions(-)
> 
> diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
> index 3f5d035..3f65c5b 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 91e9f91..56d89b2 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 */

eew, arch-specific code outside of arch-specific dirs.

Why not x86/imgconvert.h?

-- 
Anton Khirnov
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to