[FFmpeg-cvslog] Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 15:33:57 2014 +0200| [8be1120deb2b6bb7c5762071a116163d204d6ca8] | committer: Michael Niedermayer

Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'

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

Conflicts:
	libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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