Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 13:33:57 +0000 (15:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 13:33:57 +0000 (15:33 +0200)
commit8be1120deb2b6bb7c5762071a116163d204d6ca8
treeb05dcf552f6064f915eef958e2a3a463293344c3
parentc48e8d9dca550327b88106276aed17f87b23b7fe
parent685be3d1aecf965281128f3b631ed965bcfa754d
Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'

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

Conflicts:
libavcodec/libvpxenc.c

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