diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 11:11:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 11:12:11 +0200 |
commit | 46ad2d9e446304e00f44760da5abd66f5117b4fa (patch) | |
tree | f41cbe98d569fc5801aef45ec87ef5541c22515c /configure | |
parent | 5dc2c99055ae4a95336f28c58c8c8da4033979f1 (diff) | |
parent | 03039f4c8cdb4f8e5dc69905f3d73e2a531157e8 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
miscellaneous typo fixes
Conflicts:
configure
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -186,7 +186,7 @@ Individual component options: --disable-filters disable all filters External library support: - --enable-avisynth enable reading of AVISynth script files [no] + --enable-avisynth enable reading of AviSynth script files [no] --disable-bzlib disable bzlib [autodetect] --enable-fontconfig enable fontconfig --enable-frei0r enable frei0r video filtering |