From 6def57f07399898fd362cf781764a0eabf9010be Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Fri, 10 Apr 2009 20:17:03 +0300 Subject: [PATCH] Remove useless bsearch check --- configure.ac | 2 +- modules/mux/mpeg/ts.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 3dc383eadb..85fe3ebce2 100644 --- a/configure.ac +++ b/configure.ac @@ -551,7 +551,7 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([gettimeofday isatty swab sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon fork bsearch lstat posix_fadvise posix_madvise uselocale]) +AC_CHECK_FUNCS([gettimeofday isatty swab sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon fork lstat posix_fadvise posix_madvise uselocale]) AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 209f3344fc..dccd56043f 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -183,11 +183,7 @@ static void Close ( vlc_object_t * ); "encrypting." ) #define SOUT_CFG_PREFIX "sout-ts-" -#ifdef HAVE_BSEARCH -# define MAX_PMT 64 /* Maximum number of programs. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */ -#else -# define MAX_PMT 1 -#endif +#define MAX_PMT 64 /* Maximum number of programs. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */ #define MAX_PMT_PID 64 /* Maximum pids in each pmt. FIXME: I just chose an arbitary number. Where is the maximum in the spec? */ vlc_module_begin () @@ -2610,7 +2606,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) GetDescriptorLength24b( bits.i_data - bits_fix_IOD.i_data - 3 ) ); -#if 0//def HAVE_BSEARCH /* FIXME!!! This can't possibly work */ +#if 0 /* FIXME!!! This can't possibly work */ i_pidinput = p_mux->pp_inputs[i]->p_fmt->i_id; p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots, sizeof(pmt_map_t), intcompare ); @@ -2634,7 +2630,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) p_stream = (ts_stream_t *)p_mux->pp_inputs[i_stream]->p_sys; -#ifdef HAVE_BSEARCH i_pidinput = p_mux->pp_inputs[i_stream]->p_fmt->i_id; p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots, sizeof(pmt_map_t), intcompare ); @@ -2645,7 +2640,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) p_stream->i_stream_type, p_stream->i_pid ); else /* If there's an error somewhere, dump it to the first pmt */ -#endif p_es = dvbpsi_PMTAddES( &p_sys->dvbpmt[0], p_stream->i_stream_type, p_stream->i_pid ); -- 2.39.5