Merge commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 10:43:59 +0000 (12:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 10:44:03 +0000 (12:44 +0200)
* commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf':
  arm: cosmetics: Fix a misaligned asm operand

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/mlpdsp_armv5te.S

Simple merge