[FFmpeg-cvslog] Merge commit 'acd2b8e42df25d46440583f93c12e5f285aebb31'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 00:45:22 2014 +0100| [3a27f968f9902d6ce2278f61c422ede4b9dbf70e] | committer: Michael Niedermayer

Merge commit 'acd2b8e42df25d46440583f93c12e5f285aebb31'

* commit 'acd2b8e42df25d46440583f93c12e5f285aebb31':
  rnd_avg.h: K&R formatting cosmetics

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

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