[FFmpeg-cvslog] Merge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 21 21:48:44 2015 +0200| [1e7008675b2d930955b0295808ef208d92e5639d] | committer: Michael Niedermayer

Merge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'

* commit '8655c54160767de1a6b96f8bc310d6e4eaceff48':
  libvpx: Support the vp9 extended profiles

Conflicts:
	Changelog
	configure
	libavcodec/libvpx.c
	libavcodec/libvpx.h
	libavcodec/libvpxdec.c
	libavcodec/libvpxenc.c
	libavcodec/version.h

mostly not merged, as requested by jamrial

See: 01e59d48ed1a41b88107ed1d4d56ae0cbcd1a60e
See: 079b7f6eacc09bc2813fc1ddc230ab05022b69c2 and others
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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