Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to FFmpeg 3 / clang.

Browse source
This commit is contained in:
Unknown W. Brackets 2016-05-22 19:35:25 -07:00
parent a1799ab4ea
commit 316b7457b9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/Locals.mk
View file

@ -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)

2
ffmpeg

@ -1 +1 @@
Subproject commit a7cae9c5a5b48e903ae97f4c8afecc82b41eb218
Subproject commit b49a12fcafbdd62326556a7587517362a05d2cba