[FFmpeg-cvslog] Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  8 05:36:48 2014 +0100| [edba54630b6f6157802a167d04d4da4c33f52d72] | committer: Michael Niedermayer

Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'

* commit '5dae4872357613a0b51120b54a4c5221e0ec3f69':
  arm: Allow overriding the alignment set in the function macro

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

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