diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 00:15:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 00:15:49 +0100 |
| commit | 0707a34dd8173deee141762c68bd8cf845abe610 (patch) | |
| tree | ca66e185b23c8ae1b9640a0ab3c809394427f950 | |
| parent | b7c1f6f9cc752d3a29f7a14c09c15c884bf5f4e4 (diff) | |
| parent | d67dbfa7c195fabce706ca03c439419450f9bd8a (diff) | |
| download | ffmpeg-0707a34dd8173deee141762c68bd8cf845abe610.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx265: Support API version 9
See: 69ead9af7519796eebbc452fbbdb43af8d846173
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |