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

Conflicts:
	libavcodec/libvpxenc.c

See: 238ec505
See: ae330070Merged-by: Michael Niedermayer <michaelni@gmx.at>