1 files changed, 12 insertions, 1 deletions

diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make
index 331ee8916f..58d2dc84e6 100644
--- a/apps/codecs/libmad/libmad.make
+++ b/apps/codecs/libmad/libmad.make
@@ -11,7 +11,18 @@
 # (one for codec, one for mpegplayer)
 # so a little trickery is necessary
 
-MADFLAGS = $(CODECFLAGS) -UDEBUG -DNDEBUG -O2 -I$(APPSDIR)/codecs/libmad -DHAVE_LIMITS_H
+# Extract optimization level ('-O') from compile flags. Will be set later.
+MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmad
+MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H
+
+# libmad is faster on ARM-targets with -O1 than -O2
+ifeq ($(CPU),arm)
+   MADFLAGS += -O1
+else
+   MADFLAGS += -O2
+endif
+
+# MPEGplayer
 MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER
 
 # libmad