Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 14:23:37 +0000 (15:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 14:37:35 +0000 (15:37 +0100)
* qatar/master:
  float_dsp: fix errors in documentation

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

Simple merge