vlc/vlc-3.0 | branch: master | Ilkka Ollakka <[email protected]> | Sun Mar 18 14:26:18 2018 +0200| [8af4c227a3cfa2d4b3065eb24e3ce1610f80f2fc] | committer: Konstantin Pavlov
configure: bump x264 version requirement and separated x26410b check on x26410b case, check that x264 has high enough version present. 0.148 is by default in ubuntu 16.04 LTS and has been present since 2015. ref #19581 (cherry picked from commit 2529f3dabfcc40673de13c7043c23072b5e1fce9) Signed-off-by: Konstantin Pavlov <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=8af4c227a3cfa2d4b3065eb24e3ce1610f80f2fc --- configure.ac | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index 826b6ba43e..cfdae650b3 100644 --- a/configure.ac +++ b/configure.ac @@ -2826,36 +2826,12 @@ dnl x265 encoder PKG_ENABLE_MODULES_VLC([X265],, [x265], [HEVC/H.265 encoder], [auto]) dnl -dnl H264 encoder plugin (10-bit lib264) -dnl -AC_ARG_ENABLE(x26410b, - [ --enable-x26410b H264 10-bit encoding support with static libx264 (default disabled)]) -if test "${enable_x26410b}" != "no"; then - PKG_CHECK_MODULES(X26410B, x26410b, [ - VLC_ADD_PLUGIN([x26410b]) - VLC_ADD_LIBS([x26410b],[${X26410B_LIBS}]) - AS_IF([test -n "${ac_cv_ld_bsymbolic}"], [ - VLC_ADD_LDFLAGS([x26410b],[${ac_cv_ld_bsymbolic}]) - ]) - VLC_ADD_CFLAGS([x26410b],[${X26410B_CFLAGS}]) - if echo ${X26410B_LIBS} |grep -q 'pthreadGC2'; then - VLC_ADD_CFLAGS([x26410b], [-DPTW32_STATIC_LIB]) - fi - ], [ - if test "${enable_x26410b}" = "yes"; then - AC_MSG_ERROR([x26410b module doesn't work without staticly compiled libx264.a]) - fi - ]) -fi - - -dnl dnl H264 encoder plugin (using libx264) dnl AC_ARG_ENABLE(x264, [ --enable-x264 H264 encoding support with libx264 (default enabled)]) if test "${enable_x264}" != "no"; then - PKG_CHECK_MODULES(X264,x264 >= 0.86, [ + PKG_CHECK_MODULES(X264,x264 >= 0.148, [ VLC_ADD_PLUGIN([x264]) VLC_ADD_LIBS([x264],[${X264_LIBS}]) @@ -2875,6 +2851,32 @@ if test "${enable_x264}" != "no"; then fi dnl +dnl H264 encoder plugin (libx264 > 153) +dnl +AC_ARG_ENABLE(x26410b, + [ --enable-x26410b H264 10-bit encoding support with libx264 (default enabled)]) +if test "${enable_x26410b}" != "no"; then + PKG_CHECK_MODULES(X26410b,x264 >= 0.153, [ + VLC_ADD_PLUGIN([x26410b]) + VLC_ADD_LIBS([x26410b],[${X264_LIBS}]) + + AS_IF([test -n "${ac_cv_ld_bsymbolic}"], [ + VLC_ADD_LDFLAGS([x26410b],[${ac_cv_ld_bsymbolic}]) + ]) + + VLC_ADD_CFLAGS([x26410b],[${X264_CFLAGS}]) + if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then + VLC_ADD_CFLAGS([x26410b], [-DPTW32_STATIC_LIB]) + fi + ],[ + if test "${enable_x26410b}" = "yes"; then + AC_MSG_ERROR([${X264_PKG_ERRORS}: you may get it from http://www.videolan.org/x264.html]) + fi + ]) +fi + + +dnl dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder dnl PKG_ENABLE_MODULES_VLC([MFX], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto]) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
