On 11/17/2017 10:50 PM, James Zern wrote: > this will simplify libvpxenc/dec.c and ensure more stable versions of > the codecs are present. > > Signed-off-by: James Zern <jz...@google.com> > --- > configure | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/configure b/configure > index c8e2e35192..bfb1d9ab3a 100755 > --- a/configure > +++ b/configure > @@ -5895,22 +5895,22 @@ enabled libvorbis && require_pkg_config > libvorbis vorbis vorbis/codec.h > > enabled libvpx && { > enabled libvpx_vp8_decoder && { > - check_pkg_config libvpx_vp8_decoder "vpx >= 0.9.1" > "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || > - check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" > vpx_codec_dec_init_ver -lvpx || > - die "ERROR: libvpx decoder version must be >=0.9.1"; > + check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" > "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || > + check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" > "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
VPX_CODEC_CAP_HIGHBITDEPTH seems to be defined in vpx_encoder.h Is that included in vp8dx.h? > + die "ERROR: libvpx decoder version must be >=1.4.0"; > } > enabled libvpx_vp8_encoder && { > - check_pkg_config libvpx_vp8_encoder "vpx >= 0.9.7" > "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || > - check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" > "vpx_codec_enc_init_ver VP8E_SET_MAX_INTRA_BITRATE_PCT" -lvpx || > - die "ERROR: libvpx encoder version must be >=0.9.7"; > + check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" > "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || > + check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" > "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx || > + die "ERROR: libvpx encoder version must be >=1.4.0"; > } > enabled libvpx_vp9_decoder && { > - check_pkg_config libvpx_vp9_decoder "vpx >= 1.3.0" > "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || > - check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" > "vpx_codec_vp9_dx" -lvpx > + check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" > "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || > + check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" > "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" -lvpx > } > enabled libvpx_vp9_encoder && { > - check_pkg_config libvpx_vp9_encoder "vpx >= 1.3.0" > "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || > - check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" > "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx > + check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" > "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || > + check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" > "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" -lvpx > } > if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder > libvpx_vp9_encoder; then > die "libvpx enabled but no supported decoders found" > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel