Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 11:53:20 +0000 (12:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 11:53:41 +0000 (12:53 +0100)
commit3d04b1aab140ba64ab0f437ab522c03ea6efca06
tree2946796104f4b4aae82969cbc1a2596246ab26da
parent32291ba6eaacc9d4230322361b7bfee052e72040
parent6a74ebc34dd3875ce8ea672c33aec5c2538eaaaf
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float-dsp-test: do not use C99's predefined  __func__

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