libav: fix compilation without libav support

diff --git a/Makefile b/Makefile
index c2e7806106e04a5e71814d530425f8766f21d6df..b8c8c752bce93001fbf2e03ee59f2753795e5c3d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -293,7 +293,6 @@ SRCS-2 = \
        src/api/api_access.c \
        src/api/api_dvr.c \
        src/api/api_caclient.c \
-       src/api/api_codec.c \
        src/api/api_profile.c \
        src/api/api_bouquet.c \
        src/api/api_language.c \
@@ -519,7 +518,8 @@ DEPS-LIBAV = \
 SRCS-LIBAV = \
        src/libav.c \
        src/input/mpegts/iptv/iptv_libav.c \
-       src/muxer/muxer_libav.c
+       src/muxer/muxer_libav.c \
+       src/api/api_codec.c
 SRCS-LIBAV += $(wildcard src/transcoding/*.c)
 SRCS-LIBAV += $(wildcard src/transcoding/transcode/*.c)
 SRCS-LIBAV += $(SRCS-HWACCELS)

diff --git a/src/api.h b/src/api.h
index 80f2b5d286314edd6176efa859a2584653022d74..5d769a45c405553485632ccaf3541a1cec390569 100644 (file)
--- a/src/api.h
+++ b/src/api.h
@@ -76,13 +76,18 @@ void api_intlconv_init      ( void );
 void api_access_init        ( void );
 void api_dvr_init           ( void );
 void api_caclient_init      ( void );
-void api_codec_init         ( void );
 void api_profile_init       ( void );
 void api_language_init      ( void );
 void api_satip_server_init  ( void );
 void api_timeshift_init     ( void );
 void api_wizard_init        ( void );
 
+#if ENABLE_LIBAV
+void api_codec_init         ( void );
+#else
+static inline void api_codec_init(void) {};
+#endif
+
 /*
  * IDnode
  */

diff --git a/src/transcoding/codec.h b/src/transcoding/codec.h
index 8b5ee587705e49bbdae63a54873281365262b736..b0e5433ef23619ccd827d3194db9a3604ccf595f 100644 (file)
--- a/src/transcoding/codec.h
+++ b/src/transcoding/codec.h
@@ -21,6 +21,9 @@
 #ifndef TVH_TRANSCODING_CODEC_H__
 #define TVH_TRANSCODING_CODEC_H__
 
+#include "build.h"
+
+#if ENABLE_LIBAV
 
 #include "tvheadend.h"
 #include "idnode.h"
@@ -162,5 +165,18 @@ codec_init(void);
 void
 codec_done(void);
 
+#else
+
+static inline void
+codec_init(void)
+{
+}
+
+static inline void
+codec_done(void)
+{
+}
+
+#endif
 
 #endif // TVH_TRANSCODING_CODEC_H__