[FFmpeg-cvslog] Merge commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 18 12:43:59 2014 +0200| [cd4497d8c5c4dc7b06a2b2509bbdbfa9c6831c62] | committer: Michael Niedermayer

Merge commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf'

* commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf':
  arm: cosmetics: Fix a misaligned asm operand

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

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