On 2014-04-06 20:41:04 +0100, Derek Buitenhuis wrote: > Signed-off-by: Derek Buitenhuis <[email protected]> > --- > Should not be pushed until the following goes in on Monday: > > https://mailman.videolan.org/pipermail/x265-devel/2014-April/004116.html > --- > configure | 4 ++-- > libavcodec/libx265.c | 2 -- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/configure b/configure > index fdd6c2f..c354d26 100755 > --- a/configure > +++ b/configure > @@ -4051,8 +4051,8 @@ enabled libx264 && require libx264 x264.h > x264_encoder_encode -lx264 & > { check_cpp_condition x264.h "X264_BUILD >= > 118" || > die "ERROR: libx264 version must be >= > 0.118."; } > enabled libx265 && require_pkg_config x265 x265.h > x265_encoder_encode && > - { check_cpp_condition x265.h "X265_BUILD >= 13" > || > - die "ERROR: libx265 version must be >= 13."; } > + { check_cpp_condition x265.h "X265_BUILD >= 15" > || > + die "ERROR: libx265 version must be >= 15."; } > enabled libxavs && require libxavs xavs.h xavs_encoder_encode > -lxavs > enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore > enabled openssl && { check_lib openssl/ssl.h SSL_library_init > -lssl -lcrypto || > diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c > index 77d0b03..ba2e118 100644 > --- a/libavcodec/libx265.c > +++ b/libavcodec/libx265.c > @@ -115,8 +115,6 @@ static av_cold int libx265_encode_init(AVCodecContext > *avctx) > av_reduce(&sar_num, &sar_den, > avctx->sample_aspect_ratio.num, > avctx->sample_aspect_ratio.den, 4096); > - ctx->params->vui.bEnableVuiParametersPresentFlag = 1; > - ctx->params->vui.bEnableAspectRatioIdc = 1; > ctx->params->vui.aspectRatioIdc = 255; > ctx->params->vui.sarWidth = sar_num; > ctx->params->vui.sarHeight = sar_den;
ok Janne _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
