Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 13:24:38 +0000 (14:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 13:24:38 +0000 (14:24 +0100)
commitb2d0c5bd13ab100a3acb18e9c869d73904e6e764
tree2a8f631ce05e08be8829862b1cdd5cb72971b898
parente9125dd5563484a067ef75b6fce4fbef235c5c6e
parent33552a5f7b6ec7057516f487b1a902331f8c353e
Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'

* commit '33552a5f7b6ec7057516f487b1a902331f8c353e':
  arm: Add mathops.h to ARCH_HEADERS list
  avstring: K&R formatting cosmetics

Conflicts:
libavutil/avstring.c

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