From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 27 May 2014 14:02:36 +0000 (+0200)
Subject: Fix the libiconv check
X-Git-Tag: v4.1~2036
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=494280d1f7de7a29a446bdf7a0a54489d4c923e5;p=thirdparty%2Ftvheadend.git

Fix the libiconv check
---

diff --git a/Makefile b/Makefile
index e86ee9c2e..adfaa409d 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ CFLAGS  += -g -funsigned-char -O2
 CFLAGS  += -D_FILE_OFFSET_BITS=64
 CFLAGS  += -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR}
 LDFLAGS += -ldl -lpthread -lm
-ifeq ($(LIBICONV),yes)
+ifeq ($(CONFIG_LIBICONV),yes)
 LDFLAGS += -liconv
 endif
 ifneq ($(PLATFORM), darwin)
diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index a9681225d..4344f6e4f 100644
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -1086,10 +1086,12 @@ satip_frontend_input_thread ( void *aux )
       }
     }
 
+#if 0
     /* We need to keep the session alive */
     if (rtsp->hc_ping_time + rtsp->hc_rtp_timeout / 2 < dispatch_clock &&
         rtsp->hc_cmd == HTTP_CMD_NONE)
       rtsp_options(rtsp);
+#endif
 
     if (ev[0].data.ptr == lfe->sf_rtcp) {
       c = recv(lfe->sf_rtcp->fd, rtcp, sizeof(rtcp), MSG_DONTWAIT);