* commit '685be3d1':
  libvpxenc: add static-thresh private option

Conflicts:
	libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>