[FFmpeg-cvslog] Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  3 23:46:36 2014 +0200| [bc4b424dfa6e52e0deaf55452263d8113d8a3c52] | committer: Michael Niedermayer

Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'

* commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f':
  mathematics: K&R formatting cosmetics

Conflicts:
	libavutil/mathematics.c

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

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