Skip to content
Snippets Groups Projects
Commit 5c717433 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

Revert "patches: add temporary mp3 decoding fix"

This reverts commit acef484c.

This wasn't ever needed since the new gas-pp version was taken
in use at the end of May. The decoding issues in the latest release
must have come from either using an older version of gas-pp by accident
or from not updating the contribs used by the rest of the build system
properly.
parent 5ca92c36
No related branches found
No related tags found
No related merge requests found
From 21f48a547078381a52f9254985441f10a69e957d Mon Sep 17 00:00:00 2001
From: Gleb Pinigin <gpinigin@gmail.com>
Date: Mon, 13 May 2013 21:09:24 +0700
Subject: [PATCH 14/14] contrib: disable some ARM ASM in libav until
---
contrib/src/ffmpeg/rules.mak | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 36b491c..2cabd40 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -56,6 +56,12 @@ ifeq ($(ARCH),arm)
FFMPEGCONF += --arch=arm
ifdef HAVE_NEON
FFMPEGCONF += --enable-neon
+ifdef HAVE_IOS
+FFMPEGCONF += --disable-armv5te
+FFMPEGCONF += --disable-armv6
+FFMPEGCONF += --disable-armv6t2
+FFMPEGCONF += --extra-cflags='-mfpu=neon -mfloat-abi=softfp -mvectorize-with-neon-quad'
+endif
endif
ifdef HAVE_ARMV7A
FFMPEGCONF += --cpu=cortex-a8
--
1.7.12.4 (Apple Git-37)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment