From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 30 Aug 2017 13:33:07 +0000 (+0200)
Subject: libav: fix compilation without libav support
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b67ed29f5299e6d4bd76bbd91da5e62ccd942843;p=thirdparty%2Ftvheadend.git

libav: fix compilation without libav support
---

diff --git a/Makefile b/Makefile
index c2e780610..b8c8c752b 100644
--- 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 80f2b5d28..5d769a45c 100644
--- 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 8b5ee5877..b0e5433ef 100644
--- 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__