]> git.sesse.net Git - vlc/commitdiff
ffmpeg: don't force Intel Core 2 optimizations if not building 64-bit on Solaris
authorSean McGovern <gseanmcg@gmail.com>
Tue, 24 Jun 2014 21:11:30 +0000 (17:11 -0400)
committerRafaël Carré <funman@videolan.org>
Wed, 25 Jun 2014 09:14:49 +0000 (11:14 +0200)
Signed-off-by: Rafaël Carré <funman@videolan.org>
contrib/src/ffmpeg/rules.mak

index 8633bb875c780c26b9454fa3d749e3ca3e2a11cf..cae48ab26e2582120f5331ebc225c8736f0b4e6b 100644 (file)
@@ -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