Merge remote-tracking branch 'qatar/master'

* qatar/master:
  opt/eval: Include mathematics.h for NAN/INFINITY
  mathematics: Don't use division by zero in NAN/INFINITY macros
  wma: Lower the maximum number of channels to 2
  x86: cpu: clean up check for cpuid instruction support
  ARM: generate position independent code to access data symbols

Conflicts:
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 0 deletions

diff --git a/libavutil/eval.c b/libavutil/eval.c
index ceae2edf6f..771f12d90a 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -30,6 +30,7 @@
 #include "avutil.h"
 #include "eval.h"
 #include "log.h"
+#include "mathematics.h"
 
 typedef struct Parser {
     const AVClass *class;