Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 May 2014 21:12:45 +0000 (23:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 May 2014 21:15:20 +0000 (23:15 +0200)
commit83b8987df70212970a564467aff415157f98f8de
tree27e711f73e31c839a1fa9db18e9f60c2b039222b
parent1fe40e1b0538a8eb8425123c47775b5d141ae084
parentd6d767d93e532246cacf3567e6bcad76a821f838
Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'

* commit 'd6d767d93e532246cacf3567e6bcad76a821f838':
  ppc: Fix compilation for ppc64le (ELFv2)

Conflicts:
libavcodec/ppc/asm.S

See: 41b928c5fad7d4ed8477b68cb0c2d54a70b0afac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ppc/asm.S