diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:45:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:45:06 +0100 |
| commit | 5f8f9dc4362b12c78189fb9e3d8587fae4fee987 (patch) | |
| tree | 5200866be8a227b532f6225557c2a384555e6bcd /configure | |
| parent | 6db37c9468051ff34cac58fa428bc5d86fc1ee45 (diff) | |
| parent | 45235ac488363e3360bf2f2275102d1ec66eba0f (diff) | |
| download | ffmpeg-5f8f9dc4362b12c78189fb9e3d8587fae4fee987.tar.gz | |
Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'
* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
configure: Move x11grab option to a more suitable place in the help output
lavr: allow setting internal_sample_fmt option by string
lavr: Add "resample_cutoff" option as a duplicate of "cutoff"
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -130,7 +130,6 @@ Component options: --disable-pthreads disable pthreads [auto] --disable-w32threads disable Win32 threads [auto] --disable-os2threads disable OS/2 threads [auto] - --enable-x11grab enable X11 grabbing [no] --disable-network disable network support [no] --disable-dct disable DCT code --disable-dwt disable DWT code @@ -234,6 +233,7 @@ External library support: native MPEG-4/Xvid encoder exists [no] --enable-openal enable OpenAL 1.1 capture support [no] --enable-openssl enable openssl [no] + --enable-x11grab enable X11 grabbing [no] --enable-zlib enable zlib [autodetect] Advanced options (experts only): |