Merge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 19:07:10 +0000 (21:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 19:08:05 +0000 (21:08 +0200)
commit30e9ebb14f197bbc3fcbde467da39d1a79ac8d52
tree5d10386c06d6d0793951bc5179770244ed33f676
parentf399f826ee2d1e55bdae1495db9c1885589e4de1
parent05bf3f54e6078716f6267df530bf1d474ca3d606
Merge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'

* commit '05bf3f54e6078716f6267df530bf1d474ca3d606':
  libvpx: Do not set vp8 only parameters when encoding in vp9

Conflicts:
libavcodec/libvpxenc.c

See: 238ec505e263e7d0363798a05c1c28f494a6300a
See: ae330070ee8b985abb011835502b03baacfbb18c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libvpxenc.c