Michael Niedermayer 5eb353e0cd 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>

2012-07-01 22:43:09 +02:00

31 KiB

Raw Blame History

View Raw