vlc | branch: master | Sean McGovern <[email protected]> | Tue Jun 24 17:11:30 2014 -0400| [97fc89290b0279c826232b816e5ba5c334283d79] | committer: Rafaël Carré
ffmpeg: don't force Intel Core 2 optimizations if not building 64-bit on Solaris Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=97fc89290b0279c826232b816e5ba5c334283d79 --- contrib/src/ffmpeg/rules.mak | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 8633bb8..cae48ab 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -136,7 +136,10 @@ FFMPEGCONF += --enable-pthreads endif ifdef HAVE_SOLARIS -FFMPEGCONF += --cpu=core2 --enable-pic +ifeq ($(ARCH),x86_64) +FFMPEGCONF += --cpu=core2 +endif +FFMPEGCONF += --enable-pic endif # Build _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
