[FFmpeg-cvslog] Merge commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d'
Clément Bœsch
git at videolan.org
Sat Jun 25 11:24:01 CEST 2016
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Jun 25 11:23:19 2016 +0200| [7bf52e12d4a1ef445d802037795f704fcfdeb4c3] | committer: Clément Bœsch
Merge commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d'
* commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d':
configure: move the hardware accel libs' entries in the help text
Merged-by: Clément Bœsch <u at pkh.me>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bf52e12d4a1ef445d802037795f704fcfdeb4c3
---
configure | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/configure b/configure
index 7d2f1eb..51828b7 100755
--- a/configure
+++ b/configure
@@ -149,22 +149,6 @@ Component options:
--disable-faan disable floating point AAN (I)DCT code
--disable-pixelutils disable pixel utils in libavutil
-Hardware accelerators:
- --disable-d3d11va disable D3D11VA code [autodetect]
- --disable-dxva2 disable DXVA2 code [autodetect]
- --disable-vaapi disable VAAPI code [autodetect]
- --disable-vda disable VDA code [autodetect]
- --disable-vdpau disable VDPAU code [autodetect]
-
-Hardware-accelerated decoding/encoding:
- --enable-cuda enable dynamically linked CUDA [no]
- --enable-cuvid enable CUVID support [autodetect]
- --enable-libmfx enable HW acceleration through libmfx
- --enable-mmal enable decoding via MMAL [no]
- --enable-nvenc enable NVIDIA NVENC support [no]
- --enable-omx enable encoding via OpenMAX IL [no]
- --enable-omx-rpi enable encoding via OpenMAX IL for Raspberry Pi [no]
-
Individual component options:
--disable-everything disable all components listed below
--disable-encoder=NAME disable encoder NAME
@@ -217,7 +201,6 @@ External library support:
Also note that the following help text describes the purpose of the libraries
themselves, not all their features will necessarily be usable by FFmpeg.
- --disable-audiotoolbox enable AudioToolbox decoders and encoders [autodetect]
--enable-avisynth enable reading of AviSynth script files [no]
--disable-bzlib disable bzlib [autodetect]
--enable-chromaprint enable audio fingerprinting with chromaprint [no]
@@ -257,7 +240,6 @@ External library support:
--enable-libmp3lame enable MP3 encoding via libmp3lame [no]
--enable-libnut enable NUT (de)muxing via libnut,
native (de)muxer exists [no]
- --enable-libnpp enable NVIDIA Performance Primitives-based code [no]
--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]
@@ -311,11 +293,27 @@ External library support:
--disable-sdl disable sdl [autodetect]
--disable-securetransport disable Secure Transport, needed for TLS support
on OSX if openssl and gnutls are not used [autodetect]
- --disable-videotoolbox disable VideoToolbox code [autodetect]
--enable-x11grab enable X11 grabbing (legacy) [no]
--disable-xlib disable xlib [autodetect]
--disable-zlib disable zlib [autodetect]
+ The following libraries provide various hardware acceleration features:
+ --disable-audiotoolbox disable Apple AudioToolbox code [autodetect]
+ --enable-cuda enable dynamically linked Nvidia CUDA code [no]
+ --enable-cuvid enable Nvidia CUVID support [autodetect]
+ --disable-d3d11va disable Microsoft Direct3D 11 video acceleration code [autodetect]
+ --disable-dxva2 disable Microsoft DirectX 9 video acceleration code [autodetect]
+ --enable-libmfx enable Intel MediaSDK (AKA Quick Sync Video) code via libmfx [no]
+ --enable-libnpp enable Nvidia Performance Primitives-based code [no]
+ --enable-mmal enable Broadcom Multi-Media Abstraction Layer (Raspberry Pi) via MMAL [no]
+ --enable-nvenc enable Nvidia video encoding code [no]
+ --enable-omx enable OpenMAX IL code [no]
+ --enable-omx-rpi enable OpenMAX IL code for Raspberry Pi [no]
+ --disable-vaapi disable Video Acceleration API (mainly Unix/Intel) code [autodetect]
+ --disable-vda disable Apple Video Decode Acceleration code [autodetect]
+ --disable-vdpau disable Nvidia Video Decode and Presentation API for Unix code [autodetect]
+ --disable-videotoolbox disable VideoToolbox code [autodetect]
+
Toolchain options:
--arch=ARCH select architecture [$arch]
--cpu=CPU select the minimum required CPU (affects
======================================================================
diff --cc configure
index 7d2f1eb,141874e..51828b7
--- a/configure
+++ b/configure
@@@ -147,24 -131,7 +147,8 @@@ Component options
--disable-rdft disable RDFT code
--disable-fft disable FFT code
--disable-faan disable floating point AAN (I)DCT code
+ --disable-pixelutils disable pixel utils in libavutil
- Hardware accelerators:
- --disable-d3d11va disable D3D11VA code [autodetect]
- --disable-dxva2 disable DXVA2 code [autodetect]
- --disable-vaapi disable VAAPI code [autodetect]
- --disable-vda disable VDA code [autodetect]
- --disable-vdpau disable VDPAU code [autodetect]
-
- Hardware-accelerated decoding/encoding:
- --enable-cuda enable dynamically linked CUDA [no]
- --enable-cuvid enable CUVID support [autodetect]
- --enable-libmfx enable HW acceleration through libmfx
- --enable-mmal enable decoding via MMAL [no]
- --enable-nvenc enable NVIDIA NVENC support [no]
- --enable-omx enable encoding via OpenMAX IL [no]
- --enable-omx-rpi enable encoding via OpenMAX IL for Raspberry Pi [no]
-
Individual component options:
--disable-everything disable all components listed below
--disable-encoder=NAME disable encoder NAME
@@@ -215,107 -182,68 +199,121 @@@ External library support
libraries must be explicitly enabled.
Also note that the following help text describes the purpose of the libraries
- themselves, not all their features will necessarily be usable by Libav.
-
- --enable-avisynth video frameserver
- --enable-bzlib bzip2 compression [autodetect]
- --enable-frei0r video filtering plugins
- --enable-gnutls crypto
- --enable-libbs2b Bauer stereophonic-to-binaural DSP
- --enable-libcdio audio CD input
- --enable-libdc1394 IEEE 1394/Firewire camera input
- --enable-libdcadec DCA audio decoding
- --enable-libfaac AAC audio encoding
- --enable-libfdk-aac AAC audio encoding/decoding
- --enable-libfontconfig font configuration and management
- --enable-libfreetype font rendering
- --enable-libgsm GSM audio encoding/decoding
- --enable-libilbc ILBC audio encoding/decoding
- --enable-libkvazaar HEVC video encoding
- --enable-libmp3lame MP3 audio encoding
- --enable-libopencore-amrnb AMR-NB audio encoding/decoding
- --enable-libopencore-amrwb AMR-WB audio decoding
- --enable-libopencv computer vision
- --enable-libopenh264 H.264 video encoding/decoding
- --enable-libopenjpeg JPEG 2000 image encoding/decoding
- --enable-libopus Opus audio encoding/decoding
- --enable-libpulse Pulseaudio sound server
- --enable-librtmp RTMP streaming
- --enable-libschroedinger Dirac video encoding/decoding
- --enable-libsnappy snappy compression
- --enable-libspeex Speex audio encoding/decoding
- --enable-libtheora Theora video encoding/decoding
- --enable-libtwolame MP2 audio encoding
- --enable-libvo-aacenc AAC audio encoding
- --enable-libvo-amrwbenc AMR-WB audio encoding
- --enable-libvorbis Vorbis audio encoding/decoding
- --enable-libvpx VP* video encoding/decoding
- --enable-libwavpack Wavpack audio encoding/decoding
- --enable-libwebp WebP image encoding/decoding
- --enable-libx264 H.264 video encoding
- --enable-libx265 HEVC video encoding
- --enable-libxavs Chinese AVS video encoding
- --enable-libxcb X window system protocol communication
- --enable-libxcb-shm X11 shm communication [auto]
- --enable-libxcb-xfixes X11 mouse rendering [auto]
- --enable-libxvid MPEG-4 ASP video encoding
- --enable-openssl crypto
- --enable-x11grab X11 grabbing through xlib (legacy, use xcb instead)
- --enable-zlib compression [autodetect]
+ themselves, not all their features will necessarily be usable by FFmpeg.
+
- --disable-audiotoolbox enable AudioToolbox decoders and encoders [autodetect]
+ --enable-avisynth enable reading of AviSynth script files [no]
+ --disable-bzlib disable bzlib [autodetect]
+ --enable-chromaprint enable audio fingerprinting with chromaprint [no]
+ --enable-frei0r enable frei0r video filtering [no]
+ --enable-gcrypt enable gcrypt, needed for rtmp(t)e support
+ if openssl, librtmp or gmp is not used [no]
+ --enable-gmp enable gmp, needed for rtmp(t)e support
+ if openssl or librtmp is not used [no]
+ --enable-gnutls enable gnutls, needed for https support
+ if openssl is not used [no]
+ --disable-iconv disable iconv [autodetect]
+ --enable-jni enable JNI support [no]
+ --enable-ladspa enable LADSPA audio filtering [no]
+ --enable-libass enable libass subtitles rendering,
+ needed for subtitles and ass filter [no]
+ --enable-libbluray enable BluRay reading using libbluray [no]
+ --enable-libbs2b enable bs2b DSP library [no]
+ --enable-libcaca enable textual display using libcaca [no]
+ --enable-libcelt enable CELT decoding via libcelt [no]
+ --enable-libcdio enable audio CD grabbing with libcdio [no]
+ --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
+ and libraw1394 [no]
+ --enable-libebur128 enable libebur128 for EBU R128 measurement,
+ needed for loudnorm filter [no]
+ --enable-libfaac enable AAC encoding via libfaac [no]
+ --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no]
+ --enable-libflite enable flite (voice synthesis) support via libflite [no]
+ --enable-libfontconfig enable libfontconfig, useful for drawtext filter [no]
+ --enable-libfreetype enable libfreetype, needed for drawtext filter [no]
+ --enable-libfribidi enable libfribidi, improves drawtext filter [no]
+ --enable-libgme enable Game Music Emu via libgme [no]
+ --enable-libgsm enable GSM de/encoding via libgsm [no]
+ --enable-libiec61883 enable iec61883 via libiec61883 [no]
+ --enable-libilbc enable iLBC de/encoding via libilbc [no]
+ --enable-libkvazaar enable HEVC encoding via libkvazaar [no]
+ --enable-libmodplug enable ModPlug via libmodplug [no]
+ --enable-libmp3lame enable MP3 encoding via libmp3lame [no]
+ --enable-libnut enable NUT (de)muxing via libnut,
+ native (de)muxer exists [no]
- --enable-libnpp enable NVIDIA Performance Primitives-based code [no]
+ --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 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]
+ --enable-librubberband enable rubberband needed for rubberband filter [no]
+ --enable-librtmp enable RTMP[E] support via librtmp [no]
+ --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no]
+ --enable-libshine enable fixed-point MP3 encoding via libshine [no]
+ --enable-libsmbclient enable Samba protocol via libsmbclient [no]
+ --enable-libsnappy enable Snappy compression, needed for hap encoding [no]
+ --enable-libsoxr enable Include libsoxr resampling [no]
+ --enable-libspeex enable Speex de/encoding via libspeex [no]
+ --enable-libssh enable SFTP protocol via libssh [no]
+ --enable-libtesseract enable Tesseract, needed for ocr filter [no]
+ --enable-libtheora enable Theora encoding via libtheora [no]
+ --enable-libtwolame enable MP2 encoding via libtwolame [no]
+ --enable-libv4l2 enable libv4l2/v4l-utils [no]
+ --enable-libvidstab enable video stabilization using vid.stab [no]
+ --enable-libvo-amrwbenc enable AMR-WB encoding via libvo-amrwbenc [no]
+ --enable-libvorbis enable Vorbis en/decoding via libvorbis,
+ native implementation exists [no]
+ --enable-libvpx enable VP8 and VP9 de/encoding via libvpx [no]
+ --enable-libwavpack enable wavpack encoding via libwavpack [no]
+ --enable-libwebp enable WebP encoding via libwebp [no]
+ --enable-libx264 enable H.264 encoding via x264 [no]
+ --enable-libx265 enable HEVC encoding via x265 [no]
+ --enable-libxavs enable AVS encoding via xavs [no]
+ --enable-libxcb enable X11 grabbing using XCB [autodetect]
+ --enable-libxcb-shm enable X11 grabbing shm communication [autodetect]
+ --enable-libxcb-xfixes enable X11 grabbing mouse rendering [autodetect]
+ --enable-libxcb-shape enable X11 grabbing shape rendering [autodetect]
+ --enable-libxvid enable Xvid encoding via xvidcore,
+ native MPEG-4/Xvid encoder exists [no]
+ --enable-libzimg enable z.lib, needed for zscale filter [no]
+ --enable-libzmq enable message passing via libzmq [no]
+ --enable-libzvbi enable teletext support via libzvbi [no]
+ --disable-lzma disable lzma [autodetect]
+ --enable-decklink enable Blackmagic DeckLink I/O support [no]
+ --enable-mediacodec enable Android MediaCodec support [no]
+ --enable-netcdf enable NetCDF, needed for sofalizer filter [no]
+ --enable-openal enable OpenAL 1.1 capture support [no]
+ --enable-opencl enable OpenCL code
+ --enable-opengl enable OpenGL rendering [no]
+ --enable-openssl enable openssl, needed for https support
+ if gnutls is not used [no]
+ --disable-schannel disable SChannel SSP, needed for TLS support on
+ Windows if openssl and gnutls are not used [autodetect]
+ --disable-sdl disable sdl [autodetect]
+ --disable-securetransport disable Secure Transport, needed for TLS support
+ on OSX if openssl and gnutls are not used [autodetect]
- --disable-videotoolbox disable VideoToolbox code [autodetect]
+ --enable-x11grab enable X11 grabbing (legacy) [no]
+ --disable-xlib disable xlib [autodetect]
+ --disable-zlib disable zlib [autodetect]
+ The following libraries provide various hardware acceleration features:
- --enable-cuda Nvidia CUDA (dynamically linked)
- --enable-d3d11va Microsoft Direct3D 11 video acceleration [auto]
- --enable-dxva2 Microsoft DirectX 9 video acceleration [auto]
- --enable-libmfx Intel MediaSDK (AKA Quick Sync Video)
- --enable-libnpp Nvidia CUDA processing
- --enable-mmal Broadcom Multi-Media Abstraction Layer (Raspberry Pi)
- --enable-nvenc Nvidia video encoding
- --enable-omx OpenMAX IL
- --enable-omx-rpi OpenMAX IL for Raspberry Pi
- --enable-vaapi Video Acceleration API (mainly Unix/Intel)
- --enable-vda Apple Video Decode Acceleration [auto]
- --enable-vdpau Nvidia Video Decode and Presentation API for Unix [auto]
++ --disable-audiotoolbox disable Apple AudioToolbox code [autodetect]
++ --enable-cuda enable dynamically linked Nvidia CUDA code [no]
++ --enable-cuvid enable Nvidia CUVID support [autodetect]
++ --disable-d3d11va disable Microsoft Direct3D 11 video acceleration code [autodetect]
++ --disable-dxva2 disable Microsoft DirectX 9 video acceleration code [autodetect]
++ --enable-libmfx enable Intel MediaSDK (AKA Quick Sync Video) code via libmfx [no]
++ --enable-libnpp enable Nvidia Performance Primitives-based code [no]
++ --enable-mmal enable Broadcom Multi-Media Abstraction Layer (Raspberry Pi) via MMAL [no]
++ --enable-nvenc enable Nvidia video encoding code [no]
++ --enable-omx enable OpenMAX IL code [no]
++ --enable-omx-rpi enable OpenMAX IL code for Raspberry Pi [no]
++ --disable-vaapi disable Video Acceleration API (mainly Unix/Intel) code [autodetect]
++ --disable-vda disable Apple Video Decode Acceleration code [autodetect]
++ --disable-vdpau disable Nvidia Video Decode and Presentation API for Unix code [autodetect]
++ --disable-videotoolbox disable VideoToolbox code [autodetect]
+
Toolchain options:
--arch=ARCH select architecture [$arch]
--cpu=CPU select the minimum required CPU (affects
More information about the ffmpeg-cvslog
mailing list