[FFmpeg-cvslog] Merge commit '0ede7b534483c5c90f404a8f11f776d2f2da4e7e' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 11:22:10 2014 +0100| [3e4b95784793555d2216139f10375ec09f290876] | committer: Michael Niedermayer

Merge commit '0ede7b534483c5c90f404a8f11f776d2f2da4e7e' into release/2.2

* commit '0ede7b534483c5c90f404a8f11f776d2f2da4e7e':
  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=3e4b95784793555d2216139f10375ec09f290876
---