[FFmpeg-devel] [PATCH][FUTURE] libx265: Update API usage yet again

Derek Buitenhuis derek.buitenhuis at gmail.com
Sun Apr 6 21:38:13 CEST 2014


Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
---
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 f47c39f..1438011 100755
--- a/configure
+++ b/configure
@@ -4639,8 +4639,8 @@ 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."; }
 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 libzmq            && require_pkg_config libzmq zmq.h zmq_ctx_new
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 1788f65..14abf0c 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;
-- 
1.9.1



More information about the ffmpeg-devel mailing list