Merge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 20:14:39 +0000 (22:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 20:14:39 +0000 (22:14 +0200)
commit8dcbfb73d58c06fa012db5ffea97647fed95a280
treec727fbe254633fac4c8116360a9e71dfd7392b6e
parent47cc1a2bf1b757dc388cd47f43dc64e5cc543918
parent3058872c293e239e3b51e86fe18cfbe720aadff1
Merge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'

* commit '3058872c293e239e3b51e86fe18cfbe720aadff1':
  ppc: Clarify and extend the cpuid check

Conflicts:
libavutil/ppc/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/ppc/cpu.c