From 54011c22e254d9113f20053b905322c3fde7f2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Wed, 27 Jan 2016 17:47:32 +0100 Subject: build: fix when HEVC decoder is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This a very pathological situation: when we have a HEVC encoder but not a HEVC decoder. The encoder needs functions that are only available when the decoder is enabled. This patch moves the utils functions into the generic sources, such as the rest of the utils. Signed-off-by: Víctor Manuel Jáquez Leal --- gst-libs/gst/vaapi/Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index ab4e968f..eba5445b 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -76,6 +76,7 @@ libgstvaapi_source_c = \ gstvaapiutils.c \ gstvaapiutils_core.c \ gstvaapiutils_h264.c \ + gstvaapiutils_h265.c \ gstvaapiutils_mpeg2.c \ gstvaapivalue.c \ gstvaapivideopool.c \ @@ -106,6 +107,7 @@ libgstvaapi_source_h = \ gstvaapitexture.h \ gstvaapitypes.h \ gstvaapiutils_h264.h \ + gstvaapiutils_h265.h \ gstvaapiutils_mpeg2.h \ gstvaapivalue.h \ gstvaapivideopool.h \ @@ -138,6 +140,7 @@ libgstvaapi_source_priv_h = \ gstvaapiutils.h \ gstvaapiutils_core.h \ gstvaapiutils_h264_priv.h \ + gstvaapiutils_h265_priv.h \ gstvaapiutils_mpeg2_priv.h \ gstvaapiversion.h \ gstvaapivideopool_priv.h \ @@ -161,15 +164,11 @@ libgstvaapi_source_c += $(libgstvaapi_vp8dec_source_c) libgstvaapi_source_h += $(libgstvaapi_vp8dec_source_h) endif -libgstvaapi_hevcdec_source_c = \ - gstvaapidecoder_h265.c \ - gstvaapiutils_h265.c -libgstvaapi_hevcdec_source_h = gstvaapiutils_h265.h -libgstvaapi_hevcdec_source_priv_h = gstvaapiutils_h265_priv.h +libgstvaapi_hevcdec_source_c = gstvaapidecoder_h265.c +libgstvaapi_hevcdec_source_h = gstvaapidecoder_h265.h if USE_HEVC_DECODER libgstvaapi_source_c += $(libgstvaapi_hevcdec_source_c) libgstvaapi_source_h += $(libgstvaapi_hevcdec_source_h) -libgstvaapi_source_priv_h += $(libgstvaapi_hevcdec_source_priv_h) endif libgstvaapi_vp9dec_source_c = gstvaapidecoder_vp9.c -- cgit v1.2.1