Merge remote-tracking branch 'qatar/master'

* qatar/master: libx265: Support API version 9 See: 69ead9af75 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 0707a34dd8
parent b7c1f6f9cc d67dbfa7c1
commit 0707a34dd8
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -4521,8 +4521,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 >= 7" ||
-                               die "ERROR: libx265 version must be >= 7."; }
+                             { check_cpp_condition x265.h "X265_BUILD >= 9" ||
+                               die "ERROR: libx265 version must be >= 9."; }
 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