From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 8 Jan 2014 04:36:48 +0000 (+0100)
Subject: Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=edba54630b6f6157802a167d04d4da4c33f52d72;p=ffmpeg

Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'

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

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

edba54630b6f6157802a167d04d4da4c33f52d72