83b8987df7
* commit 'd6d767d93e532246cacf3567e6bcad76a821f838': ppc: Fix compilation for ppc64le (ELFv2) Conflicts: libavcodec/ppc/asm.S See: 41b928c5fad7d4ed8477b68cb0c2d54a70b0afac Merged-by: Michael Niedermayer <michaelni@gmx.at>