[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 15:23:37 2014 +0100| [8dfd0e62f5d32db66ebbe3e13144ee5720bad585] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: fix errors in documentation

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8dfd0e62f5d32db66ebbe3e13144ee5720bad585
---