Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'
* commit '685be3d1aecf965281128f3b631ed965bcfa754d': libvpxenc: add static-thresh private option Conflicts: libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <[email protected]>
- Loading branch information