Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:36:48 +0000 (05:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:36:56 +0000 (05:36 +0100)
* commit '5dae4872357613a0b51120b54a4c5221e0ec3f69':
  arm: Allow overriding the alignment set in the function macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/dsputil_arm.S
libavcodec/arm/hpeldsp_arm.S
libavutil/arm/asm.S

Simple merge
Simple merge
Simple merge