Hi,
On Sep 9, 2012 12:46 AM, "Martin Storsjö" <mar...@martin.st> wrote:
>
> This reverts parts of e0c6cce4472. There is external mmx asm that
> requires this alignment.
>
> This fixes crashes when using swscale in builds with external mmx,
> without inline assembly.
> ---
> libswscale/utils.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/libswscale/utils.c b/libswscale/utils.c
> index 34e4744..0002e17 100644
> --- a/libswscale/utils.c
> +++ b/libswscale/utils.c
> @@ -1050,7 +1050,8 @@ av_cold int sws_init_context(SwsContext *c,
SwsFilter *srcFilter,
> } else
> #endif /* HAVE_MMXEXT_INLINE */
> {
> - const int filterAlign = INLINE_MMX(cpu_flags) ? 4 :
> + const int filterAlign =
> + (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 4 :
> (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) ? 8 :
> 1;
>
> @@ -1073,7 +1074,8 @@ av_cold int sws_init_context(SwsContext *c,
SwsFilter *srcFilter,
>
> /* precalculate vertical scaler filter coefficients */
> {
> - const int filterAlign = INLINE_MMX(cpu_flags) ? 2 :
> + const int filterAlign =
> + (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 2 :
> (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) ? 8 :
> 1;
>
OK.
Who reviewed this? This should never have happened in a cosmetic patch. If
in doubt, simply poke me.
Ronald
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
