[FFmpeg-cvslog] Merge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  2 22:34:18 2014 +0200| [5cd2cdf33fcd5d6ce0485369e2506ccd9d8be4da] | committer: Michael Niedermayer

Merge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2

* commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01':
  ppc: Fix compilation for ppc64le (ELFv2)
  aarch64: Use the correct syntax for relocations

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

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