Experimental upgrade to FFmpeg 3 / clang.

hrydgard · May 23, 2016 · 5117edf · 5117edf
1 parent d053407
commit 5117edf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,10 @@
 [submodule "lang"]
 	path = lang
 	url = https://github.com/hrydgard/ppsspp-lang.git
+# URL change TEMPORARY, not meant for merge.
 [submodule "ffmpeg"]
 	path = ffmpeg
-	url = https://github.com/hrydgard/ppsspp-ffmpeg.git
+	url = https://github.com/unknownbrackets/ppsspp-ffmpeg.git
 [submodule "dx9sdk"]
 	path = dx9sdk
 	url = https://github.com/hrydgard/minidx9.git

diff --git 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