Fix the libiconv check

diff --git a/Makefile b/Makefile
index e86ee9c2e96633cfd49e168e8f129ad6d96ff6d2..adfaa409dab76e492ac456972a2474380a551155 100644 (file)
--- 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 a9681225d415f993616d42fc1379116e9f7142e4..4344f6e4f668c86af20fd9f75f96f6b008531a9f 100644 (file)
--- 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);