[FFmpeg-cvslog] Merge commit 'baa94563fede8959a638b0fa132dd2124acd93e8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 31 21:57:07 2015 +0200| [ff1995437fa22f82bff68e3fca61dfed1efbdfbb] | committer: Michael Niedermayer

Merge commit 'baa94563fede8959a638b0fa132dd2124acd93e8'

* commit 'baa94563fede8959a638b0fa132dd2124acd93e8':
  ppc: linux: Check altivec using the auxv

Conflicts:
	libavutil/ppc/cpu.c

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

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