[FFmpeg-cvslog] Merge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 31 22:14:39 2015 +0200| [8dcbfb73d58c06fa012db5ffea97647fed95a280] | committer: Michael Niedermayer

Merge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'

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

Conflicts:
	libavutil/ppc/cpu.c

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

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