From 190946ee1cb7a949ac2e3c2d57b6bd49e2d4678c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 15 Jan 2014 15:19:19 +0100
Subject: [PATCH 23/24] contrib/libavcodec: update hash and tweak configure
 chain a bit

---
 contrib/src/ffmpeg/rules.mak | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 1b41466..0c2d1fe 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -8,7 +8,7 @@ ifdef USE_FFMPEG
 HASH=74a9c92840d3494393938874c1cdd5bdb95cc918
 FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
 else
-HASH=9a4c10e3af011dd84d3135090d3ca4212cbad127
+HASH=fe96769bed828cf54c0d9dc5d55b74948a68946d
 FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz
 endif
 
@@ -64,7 +64,9 @@ endif
 
 # ARM stuff
 ifeq ($(ARCH),arm)
+ifndef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=arm
+endif
 ifdef HAVE_NEON
 FFMPEGCONF += --enable-neon
 endif
@@ -98,7 +100,6 @@ endif
 ifdef HAVE_IOS
 ifeq ($(ARCH),arm)
 FFMPEGCONF += --enable-pic --as="$(AS)"
-FFMPEGCONF += --extra-cflags='-no-integrated-as'
 endif
 endif
 ifdef HAVE_MACOSX
-- 
1.8.3.4 (Apple Git-47)