[vlc-devel] [vlc-commits] Contribs: ffmpeg, don't force x86 if not WIN64 on Windows

[Rémi Denis-Courmont]

Le 2016-02-05 20:48, git at videolan.org a écrit :
> vlc | branch: master | Steve Lhomme <robUx4 at gmail.com> | Sat Jan 30
> 09:26:50 2016 +0100| [23eddd6d56631f91338db7b94643acce55256f81] |
> committer: Jean-Baptiste Kempf
>
> Contribs: ffmpeg, don't force x86 if not WIN64 on Windows
>
> it's possible to have WIN32 for ARM
>
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
>
>> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=23eddd6d56631f91338db7b94643acce55256f81
> ---
>
>  contrib/src/ffmpeg/rules.mak |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/src/ffmpeg/rules.mak 
> b/contrib/src/ffmpeg/rules.mak
> index 3c06eea..3f99eb6 100644
> --- a/contrib/src/ffmpeg/rules.mak
> +++ b/contrib/src/ffmpeg/rules.mak
> @@ -106,6 +106,10 @@ FFMPEGCONF += --arch=x86
>  endif
>  endif
>
> +ifeq ($(ARCH),x86)
> +FFMPEGCONF+= --cpu=i686 --arch=x86
> +endif
> +

Wut? There are no architectures by that name (as far as VLC contribs 
are concerned).

>  # x86_64 stuff
>  ifeq ($(ARCH),x86_64)
>  ifndef HAVE_DARWIN_OS
> @@ -155,8 +159,6 @@ FFMPEGCONF += --enable-w32threads --enable-dxva2
>
>  ifdef HAVE_WIN64
>  FFMPEGCONF += --cpu=athlon64 --arch=x86_64
> -else # !WIN64
> -FFMPEGCONF+= --cpu=i686 --arch=x86
>  endif
>
>  else # !Windows
>
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits

-- 
Rémi Denis-Courmont
http://www.remlab.net/