From 316b7457b9f0bd2888266065cdadedff5e4d11ab Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 22 May 2016 19:35:25 -0700
Subject: [PATCH] Upgrade to FFmpeg 3 / clang.

---
 android/jni/Locals.mk | 2 +-
 ffmpeg                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index fda8cf0478..93d4030b62 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -16,7 +16,7 @@ LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)
 
 LOCAL_STATIC_LIBRARIES := native libzip glslang
-LOCAL_LDLIBS := -lz -landroid -lGLESv2 -lOpenSLES -lEGL -ldl -llog
+LOCAL_LDLIBS := -lz -landroid -lGLESv2 -lOpenSLES -lEGL -ldl -llog -latomic
 
 # ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
diff --git a/ffmpeg b/ffmpeg
index a7cae9c5a5..b49a12fcaf 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit a7cae9c5a5b48e903ae97f4c8afecc82b41eb218
+Subproject commit b49a12fcafbdd62326556a7587517362a05d2cba