diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-05-08 23:48:05 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-02-15 11:31:43 -0500 |
| commit | 5d46b5610585ad48a679576fc8c632c097462305 (patch) | |
| tree | 4027df9f4ef70f88952a4f2fdf26a4b9c98f14e7 | |
| parent | 62c636e945be74a32514da37a74baa1f979f5dab (diff) | |
| download | android_external_ffmpeg-5d46b5610585ad48a679576fc8c632c097462305.tar.gz android_external_ffmpeg-5d46b5610585ad48a679576fc8c632c097462305.tar.bz2 android_external_ffmpeg-5d46b5610585ad48a679576fc8c632c097462305.zip | |
ffmpeg: Update Android build configuration
Change-Id: I2c59c9b50553b0d33a684c1484fc377fabd38d92
| -rw-r--r-- | android/build.mk | 4 | ||||
| -rw-r--r-- | android/include/libavutil/ffversion.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/android/build.mk b/android/build.mk index cc65a0b965..70641d1285 100644 --- a/android/build.mk +++ b/android/build.mk @@ -95,8 +95,8 @@ LOCAL_CFLAGS += \ -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses \ -Wno-switch -Wno-format-zero-length -Wno-pointer-sign \ -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes \ - -Werror=return-type -Werror=vla -Wformat -Wno-maybe-uninitialized + -Werror=return-type -Werror=vla -Wformat -Wno-maybe-uninitialized -fPIC -LOCAL_LDFLAGS := -Wl,--no-fatal-warnings +LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic LOCAL_SHARED_LIBRARIES := $(sort $(FFLIBS-yes:%=lib%) $(FFLIBS:%=lib%)) diff --git a/android/include/libavutil/ffversion.h b/android/include/libavutil/ffversion.h new file mode 100644 index 0000000000..3493568ed0 --- /dev/null +++ b/android/include/libavutil/ffversion.h @@ -0,0 +1,4 @@ +#ifndef AVUTIL_FFVERSION_H +#define AVUTIL_FFVERSION_H +#define FFMPEG_VERSION "8827553" +#endif /* AVUTIL_FFVERSION_H */ |