[FFmpeg-cvslog] Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 25 14:24:38 2013 +0100| [b2d0c5bd13ab100a3acb18e9c869d73904e6e764] | committer: Michael Niedermayer

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 at gmx.at>

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