stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the libiconv check

Browse source
This commit is contained in:
Jaroslav Kysela 2014-05-27 16:02:36 +02:00
parent 5b75ff7e55
commit 494280d1f7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -33,7 +33,7 @@ CFLAGS += -g -funsigned-char -O2
CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR} CFLAGS += -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR}
LDFLAGS += -ldl -lpthread -lm LDFLAGS += -ldl -lpthread -lm
ifeq ($(LIBICONV),yes) ifeq ($(CONFIG_LIBICONV),yes)
LDFLAGS += -liconv LDFLAGS += -liconv
endif endif
ifneq ($(PLATFORM), darwin) ifneq ($(PLATFORM), darwin)

2
src/input/mpegts/satip/satip_frontend.c
View file

@ -1086,10 +1086,12 @@ satip_frontend_input_thread ( void *aux )
} }
} }
#if 0
/* We need to keep the session alive */ /* We need to keep the session alive */
if (rtsp->hc_ping_time + rtsp->hc_rtp_timeout / 2 < dispatch_clock && if (rtsp->hc_ping_time + rtsp->hc_rtp_timeout / 2 < dispatch_clock &&
rtsp->hc_cmd == HTTP_CMD_NONE) rtsp->hc_cmd == HTTP_CMD_NONE)
rtsp_options(rtsp); rtsp_options(rtsp);
#endif
if (ev[0].data.ptr == lfe->sf_rtcp) { if (ev[0].data.ptr == lfe->sf_rtcp) {
c = recv(lfe->sf_rtcp->fd, rtcp, sizeof(rtcp), MSG_DONTWAIT); c = recv(lfe->sf_rtcp->fd, rtcp, sizeof(rtcp), MSG_DONTWAIT);