diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2018-12-03 02:28:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 02:28:26 +0100 |
| commit | f7430355ed99227bd4bfe7544bdf9fbb7134918a (patch) | |
| tree | 6787935886cf9dc105ee6b30074af6ff36d79427 | |
| parent | 8d553fef63cec262d94c824d864b94d55a7d4807 (diff) | |
| parent | 1f8a1f3fdb69a5a7ed54a9ebf089808d48594587 (diff) | |
| download | UXP-f7430355ed99227bd4bfe7544bdf9fbb7134918a.tar UXP-f7430355ed99227bd4bfe7544bdf9fbb7134918a.tar.gz UXP-f7430355ed99227bd4bfe7544bdf9fbb7134918a.tar.lz UXP-f7430355ed99227bd4bfe7544bdf9fbb7134918a.tar.xz UXP-f7430355ed99227bd4bfe7544bdf9fbb7134918a.zip | |
Merge pull request #896 from trav90/media-work
Clear HAVE_LINUX_PERF_EVENT_H defines in ffvpx config before setting …
| -rw-r--r-- | media/ffvpx/config_unix32.h | 3 | ||||
| -rw-r--r-- | media/ffvpx/config_unix64.h | 3 |
2 files changed, 6 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 diff --git a/media/ffvpx/config_unix64.h b/media/ffvpx/config_unix64.h index 1c5c4cb4c..338b6692f 100644 --- a/media/ffvpx/config_unix64.h +++ b/media/ffvpx/config_unix64.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 |