diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-05 22:14:18 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2019-05-06 23:43:07 +0200 |
| commit | 652f9c4374b23d870f05446591e6c35e10909675 (patch) | |
| tree | ddc9d946c84fb32ee732e18799f68bf15a7a8148 | |
| parent | 4a8fa449e667ba32d60df77f3d90114256386ba0 (diff) | |
| download | gstreamer-plugins-good-652f9c4374b23d870f05446591e6c35e10909675.tar.gz | |
vpx: Fix build against libvpx 1.8
The deprecated debug visualizer was removed.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | ext/vpx/gstvpxdec.c | 2 | ||||
| -rw-r--r-- | ext/vpx/meson.build | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index deb74f105..00fa5c89a 100644 --- a/configure.ac +++ b/configure.ac @@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [ AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger]) ], [true]) + PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [ + AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger]) + ], [true]) + LIBS="$OLD_LIBS" CFLAGS="$OLD_CFLAGS" fi diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c index c3f0f625f..da4322513 100644 --- a/ext/vpx/gstvpxdec.c +++ b/ext/vpx/gstvpxdec.c @@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, +#ifndef HAVE_VPX_1_8 {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), "Print frame information", "visualize-frame-info"}, @@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), "Print video rate info", "visualize-rate-info"}, +#endif {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, {0, NULL, NULL} }; diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build index 685aeb7d4..dd8f85c6e 100644 --- a/ext/vpx/meson.build +++ b/ext/vpx/meson.build @@ -49,6 +49,10 @@ if vpx_dep.found() vpx_args += '-DHAVE_VPX_1_4' endif + if dependency('vpx', version : '>=1.8.0', required : false).found() + vpx_args += '-DHAVE_VPX_1_8' + endif + gstvpx = library('gstvpx', vpx_sources, c_args : gst_plugins_good_args + vpx_args, |