diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-18 11:39:00 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-18 11:39:00 +0100 |
| commit | 76fe52eb81db323ceaa8396de39b76efbce1c25e (patch) | |
| tree | 061c409281374d893f9730f89e6a4ef32d0b53f9 /media/ffvpx/config_unix32.h | |
| parent | 63635e38ff9341c02fae7f4557d230ec710947b6 (diff) | |
| parent | 680c3eadb6aaec1f3653636db081a519e0f62ef5 (diff) | |
| download | UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.gz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.lz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.xz UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.zip | |
Merge branch 'master' into Basilisk-releasev2018.12.18
Diffstat (limited to 'media/ffvpx/config_unix32.h')
| -rw-r--r-- | media/ffvpx/config_unix32.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/ffvpx/config_unix32.h b/media/ffvpx/config_unix32.h index ae49d8075..172205963 100644 --- a/media/ffvpx/config_unix32.h +++ b/media/ffvpx/config_unix32.h @@ -213,6 +213,9 @@ #define HAVE_ES2_GL_H 0 #define HAVE_GSM_H 0 #define HAVE_IO_H 0 +#ifdef HAVE_LINUX_PERF_EVENT_H +#undef HAVE_LINUX_PERF_EVENT_H +#endif #define HAVE_LINUX_PERF_EVENT_H 0 #define HAVE_MACHINE_IOCTL_BT848_H 0 #define HAVE_MACHINE_IOCTL_METEOR_H 0 |