Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:46:36 +0000 (23:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:46:36 +0000 (23:46 +0200)
commitbc4b424dfa6e52e0deaf55452263d8113d8a3c52
tree1f43dd4925af8dc8df57cfab0704baee51102636
parent1c4110be90380fbe7c6bac1306616b79325107ed
parentde69aedf9935631b7f78e8b8da6e460422a9bc5f
Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'

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

Conflicts:
libavutil/mathematics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/mathematics.c