Merge commit '0ede7b534483c5c90f404a8f11f776d2f2da4e7e' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:22:10 +0000 (11:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:22:10 +0000 (11:22 +0100)
* commit '0ede7b534483c5c90f404a8f11f776d2f2da4e7e':
  float_dsp: fix errors in documentation

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

Simple merge