Merge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 20:34:18 +0000 (22:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 20:34:22 +0000 (22:34 +0200)
* commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01':
  ppc: Fix compilation for ppc64le (ELFv2)
  aarch64: Use the correct syntax for relocations

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

Simple merge
Simple merge