diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-06-20 22:17:32 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-02-15 11:31:55 -0500 |
| commit | 938ba5018451074e2c6fdf59ced25888b01b104f (patch) | |
| tree | 285778fa5373cf3ef85df722b92d519636f72bec | |
| parent | 8b97ca47daa10ccce4bcfb921aa6a17bdc4082c8 (diff) | |
| download | android_external_ffmpeg-938ba5018451074e2c6fdf59ced25888b01b104f.tar.gz android_external_ffmpeg-938ba5018451074e2c6fdf59ced25888b01b104f.tar.bz2 android_external_ffmpeg-938ba5018451074e2c6fdf59ced25888b01b104f.zip | |
ffmpeg: Readd missing X86 fixups
* These detect wrongly during configure with the bundled GCC.
* Add fixups to the generator script to adjust for X86.
Change-Id: I637b348372a1f34118dd08d893d83b50027447ca
| -rw-r--r-- | android/config-silvermont.mak | 2 | ||||
| -rw-r--r-- | android/include/config-silvermont.h | 2 | ||||
| -rw-r--r-- | android/include/config-x86.h | 2 | ||||
| -rw-r--r-- | android/include/config.asm | 2 | ||||
| -rwxr-xr-x | gen-android-configs | 3 |
5 files changed, 7 insertions, 4 deletions
diff --git a/android/config-silvermont.mak b/android/config-silvermont.mak index 93057fe5b8..c4fb1724a5 100644 --- a/android/config-silvermont.mak +++ b/android/config-silvermont.mak @@ -445,7 +445,7 @@ HAVE_PTHREADS=yes !HAVE_ASM_MOD_Q=yes HAVE_ATTRIBUTE_MAY_ALIAS=yes HAVE_ATTRIBUTE_PACKED=yes -HAVE_EBP_AVAILABLE=yes +!HAVE_EBP_AVAILABLE=yes !HAVE_EBX_AVAILABLE=yes !HAVE_GNU_AS=yes !HAVE_GNU_WINDRES=yes diff --git a/android/include/config-silvermont.h b/android/include/config-silvermont.h index b1c3431cc8..fe55947b37 100644 --- a/android/include/config-silvermont.h +++ b/android/include/config-silvermont.h @@ -1192,7 +1192,7 @@ #ifdef HAVE_EBP_AVAILABLE #undef HAVE_EBP_AVAILABLE #endif -#define HAVE_EBP_AVAILABLE 1 +#define HAVE_EBP_AVAILABLE 0 #ifdef HAVE_EBX_AVAILABLE #undef HAVE_EBX_AVAILABLE #endif diff --git a/android/include/config-x86.h b/android/include/config-x86.h index cfaf6fa5be..fa64aaf13d 100644 --- a/android/include/config-x86.h +++ b/android/include/config-x86.h @@ -1192,7 +1192,7 @@ #ifdef HAVE_EBP_AVAILABLE #undef HAVE_EBP_AVAILABLE #endif -#define HAVE_EBP_AVAILABLE 1 +#define HAVE_EBP_AVAILABLE 0 #ifdef HAVE_EBX_AVAILABLE #undef HAVE_EBX_AVAILABLE #endif diff --git a/android/include/config.asm b/android/include/config.asm index 2ba7a96d5c..7ea9e276a5 100644 --- a/android/include/config.asm +++ b/android/include/config.asm @@ -291,7 +291,7 @@ %define HAVE_ASM_MOD_Q 0 %define HAVE_ATTRIBUTE_MAY_ALIAS 1 %define HAVE_ATTRIBUTE_PACKED 1 -%define HAVE_EBP_AVAILABLE 1 +%define HAVE_EBP_AVAILABLE 0 %define HAVE_EBX_AVAILABLE 0 %define HAVE_GNU_AS 0 %define HAVE_GNU_WINDRES 0 diff --git a/gen-android-configs b/gen-android-configs index 7fa980b1a5..3e66fcf342 100755 --- a/gen-android-configs +++ b/gen-android-configs @@ -31,3 +31,6 @@ done cp config.asm android/include/ cp libavutil/avconfig.h android/include/libavutil/ + +# Not sure why this gets configured wrong.. +perl -pi -e "s/define HAVE_EBP_AVAILABLE 1/define HAVE_EBP_AVAILABLE 0/g" android/include/config-silvermont.h android/include/config-x86.h android/include/config.asm |