Merge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 19:48:44 +0000 (21:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 20:57:54 +0000 (22:57 +0200)
commit1e7008675b2d930955b0295808ef208d92e5639d
tree7613e4d48a8d265373b678fe709ec81ab3d1d308
parent30e9ebb14f197bbc3fcbde467da39d1a79ac8d52
parent8655c54160767de1a6b96f8bc310d6e4eaceff48
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@gmx.at>
configure
libavcodec/avcodec.h
libavcodec/libvpx.c
libavcodec/libvpx.h
libavcodec/libvpxenc.c
libavcodec/version.h