diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:33:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:33:57 +0200 |
| commit | 8be1120deb2b6bb7c5762071a116163d204d6ca8 (patch) | |
| tree | b05dcf552f6064f915eef958e2a3a463293344c3 /libavutil/x86/x86util.asm | |
| parent | c48e8d9dca550327b88106276aed17f87b23b7fe (diff) | |
| parent | 685be3d1aecf965281128f3b631ed965bcfa754d (diff) | |
| download | ffmpeg-8be1120deb2b6bb7c5762071a116163d204d6ca8.tar.gz | |
Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'
* commit '685be3d1aecf965281128f3b631ed965bcfa754d':
libvpxenc: add static-thresh private option
Conflicts:
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/x86util.asm')
0 files changed, 0 insertions, 0 deletions