Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Support API version 9

See: 69ead9af7519796eebbc452fbbdb43af8d846173
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index aa640a9,4d7382a..c215478
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4519,33 -3978,12 +4519,33 @@@ enabled libwavpack        && require li
  enabled libwebp           && require_pkg_config libwebp webp/encode.h WebPGetEncoderVersion
  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."; }
 +                               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
 +enabled libzvbi           && require libzvbi libzvbi.h vbi_decoder_new -lzvbi
 +enabled openal            && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do
 +                               check_lib 'AL/al.h' alGetError "${al_libs}" && break; done } ||
 +                               die "ERROR: openal not found"; } &&
 +                             { check_cpp_condition "AL/al.h" "defined(AL_VERSION_1_1)" ||
 +                               die "ERROR: openal must be installed and version must be 1.1 or compatible"; }
 +enabled opencl            && { check_lib2 OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
 +                               check_lib2 CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
 +                               die "ERROR: opencl not found"; } &&
 +                             { ! enabled_any w32threads os2threads ||
 +                               die "opencl currently needs --enable-pthreads or --disable-w32threads"; } &&
 +                             { check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
 +                               check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
 +                               die "ERROR: opencl must be installed and version must be 1.2 or compatible"; }
 +enabled opengl            && { check_lib GL/glx.h glXGetProcAddress "-lGL" ||
 +                               check_lib2 windows.h wglGetProcAddress "-lopengl32 -lgdi32" ||
 +                               check_lib2 OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" ||
 +                               check_lib2 ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
 +                               die "ERROR: opengl not found."
 +                             }
  enabled openssl           && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||