diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:36:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:36:34 +0200 |
commit | 73d5cf8f43786b3a643d9955e4c6499f5b391b81 (patch) | |
tree | 8b6435ea549944a7863eda9629341a428a4ccb03 /configure | |
parent | 5d199c3ad985eab4500cbfd2d1146ac70197ceac (diff) | |
parent | 84d3ff50cd679e0f35f0b7ce2cb2cedd99169959 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add a libwavpack encoder wrapper
Conflicts:
Changelog
doc/encoders.texi
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -232,6 +232,7 @@ External library support: --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-libx264 enable H.264 encoding via x264 [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxvid enable Xvid encoding via xvidcore, @@ -1194,6 +1195,7 @@ EXTERNAL_LIBRARY_LIST=" libvo_amrwbenc libvorbis libvpx + libwavpack libx264 libxavs libxvid @@ -2011,6 +2013,7 @@ libvpx_vp8_decoder_deps="libvpx" libvpx_vp8_encoder_deps="libvpx" libvpx_vp9_decoder_deps="libvpx" libvpx_vp9_encoder_deps="libvpx" +libwavpack_encoder_deps="libwavpack" libx264_encoder_deps="libx264" libx264rgb_encoder_deps="libx264" libxavs_encoder_deps="libxavs" @@ -4156,6 +4159,7 @@ enabled libvpx && { die "ERROR: libvpx encoder version must be >=0.9.7"; } 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" -lvpx || disable libvpx_vp9_encoder; } } +enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 && { check_cpp_condition x264.h "X264_BUILD >= 118" || die "ERROR: libx264 must be installed and version must be >= 0.118."; } |