build: fix when HEVC decoder is disabled

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 <victorx.jaquez@intel.com>
This commit is contained in:
Víctor Manuel Jáquez Leal 2016-01-27 17:47:32 +01:00
parent ba91bf4c56
commit 54011c22e2

View file

@ -76,6 +76,7 @@ libgstvaapi_source_c = \
gstvaapiutils.c \ gstvaapiutils.c \
gstvaapiutils_core.c \ gstvaapiutils_core.c \
gstvaapiutils_h264.c \ gstvaapiutils_h264.c \
gstvaapiutils_h265.c \
gstvaapiutils_mpeg2.c \ gstvaapiutils_mpeg2.c \
gstvaapivalue.c \ gstvaapivalue.c \
gstvaapivideopool.c \ gstvaapivideopool.c \
@ -106,6 +107,7 @@ libgstvaapi_source_h = \
gstvaapitexture.h \ gstvaapitexture.h \
gstvaapitypes.h \ gstvaapitypes.h \
gstvaapiutils_h264.h \ gstvaapiutils_h264.h \
gstvaapiutils_h265.h \
gstvaapiutils_mpeg2.h \ gstvaapiutils_mpeg2.h \
gstvaapivalue.h \ gstvaapivalue.h \
gstvaapivideopool.h \ gstvaapivideopool.h \
@ -138,6 +140,7 @@ libgstvaapi_source_priv_h = \
gstvaapiutils.h \ gstvaapiutils.h \
gstvaapiutils_core.h \ gstvaapiutils_core.h \
gstvaapiutils_h264_priv.h \ gstvaapiutils_h264_priv.h \
gstvaapiutils_h265_priv.h \
gstvaapiutils_mpeg2_priv.h \ gstvaapiutils_mpeg2_priv.h \
gstvaapiversion.h \ gstvaapiversion.h \
gstvaapivideopool_priv.h \ gstvaapivideopool_priv.h \
@ -161,15 +164,11 @@ libgstvaapi_source_c += $(libgstvaapi_vp8dec_source_c)
libgstvaapi_source_h += $(libgstvaapi_vp8dec_source_h) libgstvaapi_source_h += $(libgstvaapi_vp8dec_source_h)
endif endif
libgstvaapi_hevcdec_source_c = \ libgstvaapi_hevcdec_source_c = gstvaapidecoder_h265.c
gstvaapidecoder_h265.c \ libgstvaapi_hevcdec_source_h = gstvaapidecoder_h265.h
gstvaapiutils_h265.c
libgstvaapi_hevcdec_source_h = gstvaapiutils_h265.h
libgstvaapi_hevcdec_source_priv_h = gstvaapiutils_h265_priv.h
if USE_HEVC_DECODER if USE_HEVC_DECODER
libgstvaapi_source_c += $(libgstvaapi_hevcdec_source_c) libgstvaapi_source_c += $(libgstvaapi_hevcdec_source_c)
libgstvaapi_source_h += $(libgstvaapi_hevcdec_source_h) libgstvaapi_source_h += $(libgstvaapi_hevcdec_source_h)
libgstvaapi_source_priv_h += $(libgstvaapi_hevcdec_source_priv_h)
endif endif
libgstvaapi_vp9dec_source_c = gstvaapidecoder_vp9.c libgstvaapi_vp9dec_source_c = gstvaapidecoder_vp9.c