vlc/vlc-2.2 | branch: master | Sean McGovern <[email protected]> | Tue Jun 24 17:11:30 2014 -0400| [5e1ffd022fbd4c2884b187f194d24852c417edc3] | committer: Jean-Baptiste Kempf
ffmpeg: don't force Intel Core 2 optimizations if not building 64-bit on Solaris Signed-off-by: Rafaël Carré <[email protected]> (cherry picked from commit 97fc89290b0279c826232b816e5ba5c334283d79) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5e1ffd022fbd4c2884b187f194d24852c417edc3 --- 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 349ff25..6a606ff 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
