Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 17:52:21 +0000 (18:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 17:52:21 +0000 (18:52 +0100)
commitcd1d4b51e3ed741439557b6943213748ed3f300d
treec4d1c285df94d1848b4f1a2938cf25fd1d1d5a3c
parent8d024c51071ded5e6d4fa500ee5f3c1ce4886d07
parent46caba4a65237c006ab54b0c16ecc00d21dedda1
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: Replace arch optimization ifdefs by if cascade

Conflicts:
libavutil/float_dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/float_dsp.c