diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 17:26:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 17:27:19 +0100 |
| commit | 93870f0a0b71328d4502d8f979481e42e3cb71b4 (patch) | |
| tree | 03d04678d4b8663299a06155e02b220e755876e1 /configure | |
| parent | de8f70b8e02dd0b036c5bd0b219dd495de976b58 (diff) | |
| parent | 3852e2c926ddb166c7aa69c4644a86100ea144d9 (diff) | |
| download | ffmpeg-93870f0a0b71328d4502d8f979481e42e3cb71b4.tar.gz | |
Merge commit '3852e2c926ddb166c7aa69c4644a86100ea144d9'
* commit '3852e2c926ddb166c7aa69c4644a86100ea144d9':
libopenh264enc: Fix a typo and some nitpicks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -226,7 +226,7 @@ External library support: --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no] --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no] --enable-libopencv enable video filtering via libopencv [no] - --enable-libopenh264 enable H264 encoding via OpenH264 [no] + --enable-libopenh264 enable H.264 encoding via OpenH264 [no] --enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no] --enable-libopus enable Opus de/encoding via libopus [no] --enable-libpulse enable Pulseaudio input via libpulse [no] |