On 27/05/15 16:06, Vittorio Giovara wrote: > Bump the minimum libvpx version to 1.4.0 so that all pixel > formats are present. Add new VP9 profiles. > > Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com> > --- > configure | 12 +++++++---- > libavcodec/avcodec.h | 4 ++++ > libavcodec/libvpx.c | 56 > ++++++++++++++++++++++++++++++++++++++++++-------- > libavcodec/libvpx.h | 3 ++- > libavcodec/libvpxdec.c | 7 ++----- > libavcodec/libvpxenc.c | 32 +++++++++++++++++++++-------- > libavcodec/version.h | 2 +- > 7 files changed, 88 insertions(+), 28 deletions(-) > > diff --git a/configure b/configure > index 863e33b..28da759 100755 > --- a/configure > +++ b/configure > @@ -4274,10 +4274,14 @@ enabled libvo_aacenc && require libvo_aacenc > vo-aacenc/voAAC.h voGetAACEncA > enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h > E_IF_init -lvo-amrwbenc > enabled libvorbis && require libvorbis vorbis/vorbisenc.h > vorbis_info_init -lvorbisenc -lvorbis -logg > enabled libvpx && { > - enabled libvpx_vp8_decoder && { check_lib2 "vpx/vpx_decoder.h > vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx || > - die "ERROR: libvpx decoder version must > be >=0.9.1"; } > - enabled libvpx_vp8_encoder && { check_lib2 "vpx/vpx_encoder.h > vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_CQ" -lvpx || > - die "ERROR: libvpx encoder version must > be >=0.9.6"; } > + enabled libvpx_vp8_decoder && { > + { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver > -lvpx && > + check_lib2 "vpx/vpx_image.h" VPX_IMG_FMT_HIGHBITDEPTH; > + } || die "ERROR: libvpx decoder version must be >=1.4.0"; } > + enabled libvpx_vp8_encoder && { > + { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver > VPX_CQ" -lvpx && > + check_lib2 "vpx/vpx_image.h" VPX_IMG_FMT_HIGHBITDEPTH; > + } || die "ERROR: libvpx encoder version must be >=1.4.0"; }
require_pkg_config "vpx >= 1.4.0" vpx/vpx_decoder.h vpx/vp8dx.h vpx_codec_dec_init_ver might be nicer. lu _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel