[vlc-commits] Contrib: ffmpeg is not affected by the default optim flags

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Mon Mar 30 12:12:30 2015 +0000| [de2f058a81b26482e474c8c2529f60186e3aa402] | committer: Jean-Baptiste Kempf

Contrib: ffmpeg is not affected by the default optim flags

it uses its own system, so we must give it the proper value with --disable-option

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=de2f058a81b26482e474c8c2529f60186e3aa402
---

 contrib/src/ffmpeg/rules.mak |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index f8cd11b..61ea7e8 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -50,6 +50,7 @@ FFMPEGCONF += --disable-encoders --disable-muxers
 endif
 
 # Small size
+ifdef WITH_OPTIMIZATION
 ifdef ENABLE_SMALL
 FFMPEGCONF += --enable-small
 endif
@@ -58,6 +59,9 @@ ifdef HAVE_ARMV7A
 FFMPEGCONF += --enable-thumb
 endif
 endif
+else
+FFMPEGCONF += --optflags=-O0
+endif
 
 ifdef HAVE_CROSS_COMPILE
 FFMPEGCONF += --enable-cross-compile --disable-programs