diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-10 16:59:13 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-10 16:59:13 +0100 |
| commit | 9697bfa68f32984b196748e388d743dddbe6aa7b (patch) | |
| tree | 3d8d23560d512199fbc8334bd15514d70ea00268 /media/ffvpx/config_unix32.h | |
| parent | 7d398710beb67e03bf1690f73cdfd1ef2b76d31a (diff) | |
| parent | fbbda481dce5c367b4ccdeacc70cdcd7f68ac8af (diff) | |
| download | UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.gz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.lz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.xz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.zip | |
Merge branch 'master' into Sync-weave
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 |