diff options
author | Urvang Joshi <urvang@google.com> | 2015-05-19 18:04:07 -0700 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-23 03:31:28 +0200 |
commit | 02cf59f3a6192c95ef1394e21a6f87704194bc21 (patch) | |
tree | d1f586dcb5a52faf4c1675f41f5210e09df8dc6f /configure | |
parent | ebb0ca3d70465ab6d369a66b2ef43bb059705db8 (diff) | |
download | ffmpeg-02cf59f3a6192c95ef1394e21a6f87704194bc21.tar.gz |
WebP encoder: use WebPAnimEncoder API when available.
WebPAnimEncoder API is a combination of encoder (WebPEncoder) and muxer
(WebPMux). It performs several optimizations to make it more efficient
than the combination of WebPEncode() and native ffmpeg muxer.
When WebPAnimEncoder API is used:
- In the encoder layer: we use WebPAnimEncoderAdd() instead of
WebPEncode().
- The muxer layer: works like a raw muxer.
On the other hand, when WebPAnimEncoder API isn't available, the old code is
used as it is:
- In the codec layer: WebPEncode is used to encode each frame
- In the muxer layer: ffmpeg muxer is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -1695,6 +1695,7 @@ HEADERS_LIST=" udplite_h unistd_h valgrind_valgrind_h + webp_mux_h windows_h winsock2_h " @@ -1897,6 +1898,7 @@ CONFIG_EXTRA=" intrax8 jpegtables lgplv3 + libwebp_anim llauddsp llviddsp lpc @@ -2451,6 +2453,7 @@ libvpx_vp9_decoder_deps="libvpx" libvpx_vp9_encoder_deps="libvpx" libwavpack_encoder_deps="libwavpack" libwebp_encoder_deps="libwebp" +libwebp_anim_encoder_deps="libwebp" libx264_encoder_deps="libx264" libx264rgb_encoder_deps="libx264" libx264rgb_encoder_select="libx264_encoder" @@ -5102,7 +5105,11 @@ enabled libvpx && { enabled libvpx_vp9_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; } enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx || disable libvpx_vp9_encoder; } } enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack -enabled libwebp && require_pkg_config "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion +enabled libwebp && { + enabled libwebp_encoder && require_pkg_config "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion; + enabled libwebp_anim_encoder && require_pkg_config "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion && + { use_pkg_config "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit || + { disable libwebp_anim_encoder && warn "using libwebp without libwebpmux"; } } } enabled libx264 && { use_pkg_config x264 "stdint.h x264.h" x264_encoder_encode || { require libx264 x264.h x264_encoder_encode -lx264 && warn "using libx264 without pkg-config"; } } && |