diff --git a/project/jni/ffmpeg/Android.mk b/project/jni/ffmpeg/Android.mk index 89e18d380..d32d2cc5b 100644 --- a/project/jni/ffmpeg/Android.mk +++ b/project/jni/ffmpeg/Android.mk @@ -4,6 +4,19 @@ LOCAL_PATH:=$(call my-dir) +ifneq ($(FFMPEG_REBUILD_FROM_SOURCE),yes) + +# FFMPEG compilation is hacky and buggy, so we're using prebuilt libraries by default +include $(CLEAR_VARS) +LOCAL_MODULE := $(notdir $(LOCAL_PATH)) +ifneq ($(LOCAL_MODULE),ffmpeg) +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so +include $(PREBUILT_SHARED_LIBRARY) +endif + +else + ifeq ($(notdir $(LOCAL_PATH)),ffmpeg) # Build only from ffmpeg directory, ignore symlinks FFMPEG_VERBOSE_BUILD := yes @@ -613,3 +626,4 @@ endif #======================================================================== endif #CONFIG_FFMPEG_COMPILE_TOOLS endif +endif diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so new file mode 100755 index 000000000..c57fb8f6d Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so new file mode 100755 index 000000000..0dc7e819b Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so new file mode 100755 index 000000000..2ab909fa9 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so new file mode 100755 index 000000000..ce76fa557 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavresample.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavresample.so new file mode 100755 index 000000000..d943286d5 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi-v7a/libavresample.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so new file mode 100755 index 000000000..ca8bd5836 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libswresample.so b/project/jni/ffmpeg/lib/armeabi-v7a/libswresample.so new file mode 100755 index 000000000..7a96d5c07 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi-v7a/libswresample.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so b/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so new file mode 100755 index 000000000..df3011ef4 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavcodec.so b/project/jni/ffmpeg/lib/armeabi/libavcodec.so new file mode 100755 index 000000000..182fe0e70 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi/libavcodec.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavdevice.so b/project/jni/ffmpeg/lib/armeabi/libavdevice.so new file mode 100755 index 000000000..dfbcf2a80 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi/libavdevice.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavfilter.so b/project/jni/ffmpeg/lib/armeabi/libavfilter.so new file mode 100755 index 000000000..e4c590029 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi/libavfilter.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavformat.so b/project/jni/ffmpeg/lib/armeabi/libavformat.so new file mode 100755 index 000000000..4f0497828 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi/libavformat.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavresample.so b/project/jni/ffmpeg/lib/armeabi/libavresample.so new file mode 100755 index 000000000..606e6b60c Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi/libavresample.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavutil.so b/project/jni/ffmpeg/lib/armeabi/libavutil.so new file mode 100755 index 000000000..f245d5c00 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi/libavutil.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libswresample.so b/project/jni/ffmpeg/lib/armeabi/libswresample.so new file mode 100755 index 000000000..52f91dfd4 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi/libswresample.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libswscale.so b/project/jni/ffmpeg/lib/armeabi/libswscale.so new file mode 100755 index 000000000..830cb8ff8 Binary files /dev/null and b/project/jni/ffmpeg/lib/armeabi/libswscale.so differ