Skip to content

V
vlc-gpu
Commit f13c9f6f authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* ts: do not include eit.h if TS_USE_DVB_SI is 0.

parent 7b5a1062
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
modules/demux/ts.c
View file @ f13c9f6f
...@@ -47,7 +47,9 @@ ...@@ -47,7 +47,9 @@
# include <dvbpsi/pat.h> # include <dvbpsi/pat.h>
# include <dvbpsi/pmt.h> # include <dvbpsi/pmt.h>
# include <dvbpsi/sdt.h> # include <dvbpsi/sdt.h>
# include <dvbpsi/eit.h> # if TS_USE_DVB_SI
# include <dvbpsi/eit.h>
# endif
# include <dvbpsi/dr.h> # include <dvbpsi/dr.h>
# include <dvbpsi/psi.h> # include <dvbpsi/psi.h>
#else #else
...@@ -57,7 +59,9 @@ ...@@ -57,7 +59,9 @@
# include "tables/pat.h" # include "tables/pat.h"
# include "tables/pmt.h" # include "tables/pmt.h"
# include "tables/sdt.h" # include "tables/sdt.h"
# include "tables/eit.h" # if TS_USE_DVB_SI
# include "tables/eit.h"
# endif
# include "descriptors/dr.h" # include "descriptors/dr.h"
# include "psi.h" # include "psi.h"
#endif #endif
...@@ -320,8 +324,10 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ); ...@@ -320,8 +324,10 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type );
static void PATCallBack( demux_t *, dvbpsi_pat_t * ); static void PATCallBack( demux_t *, dvbpsi_pat_t * );
static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ); static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt );
#if TS_USE_DVB_SI
static void PSINewTableCallBack( demux_t *, dvbpsi_handle, static void PSINewTableCallBack( demux_t *, dvbpsi_handle,
uint8_t i_table_id, uint16_t i_extension ); uint8_t i_table_id, uint16_t i_extension );
#endif
static inline int PIDGet( block_t *p ) static inline int PIDGet( block_t *p )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment