Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jul 2012 20:12:38 +0000 (22:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jul 2012 20:43:09 +0000 (22:43 +0200)
commit5eb353e0cd62ad212634c14e4b863554c0bc6161
tree0f53c933b7a61bf14553c3ab8abb8226bd9c23bb
parent23eeffcd48a15e73fb2649b712870b6d101c5471
parent3893feeccdf754057fc7c7ac711ae876733f2f33
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>
libavcodec/arm/fft_fixed_neon.S
libavcodec/arm/fft_neon.S
libavcodec/arm/vp3dsp_neon.S
libavcodec/arm/vp8_armv6.S
libavcodec/wma.c
libavcodec/wmadec.c
libavutil/arm/asm.S
libavutil/eval.c
libavutil/mathematics.h
libavutil/opt.c