Commit 6b18ddaa authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

mux ts: remove outdated defines

parent e0405115
...@@ -46,25 +46,14 @@ ...@@ -46,25 +46,14 @@
#include "pes.h" #include "pes.h"
#include "csa.h" #include "csa.h"
#ifdef HAVE_DVBPSI_DR_H # include <dvbpsi/dvbpsi.h>
# include <dvbpsi/dvbpsi.h> # include <dvbpsi/demux.h>
# include <dvbpsi/demux.h> # include <dvbpsi/descriptor.h>
# include <dvbpsi/descriptor.h> # 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/dr.h>
# include <dvbpsi/dr.h> # include <dvbpsi/psi.h>
# include <dvbpsi/psi.h>
#else
# include "dvbpsi.h"
# include "demux.h"
# include "descriptor.h"
# include "tables/pat.h"
# include "tables/pmt.h"
# include "tables/sdt.h"
# include "descriptors/dr.h"
# include "psi.h"
#endif
/* /*
* TODO: * TODO:
...@@ -2724,7 +2713,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) ...@@ -2724,7 +2713,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
p_stream->i_decoder_specific_info, p_stream->i_decoder_specific_info,
p_stream->p_decoder_specific_info ); p_stream->p_decoder_specific_info );
} }
#ifdef _DVBPSI_DR_59_H_
else else
{ {
/* from the dvbsub transcoder */ /* from the dvbsub transcoder */
...@@ -2745,7 +2733,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) ...@@ -2745,7 +2733,6 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
dvbpsi_PMTESAddDescriptor( p_es, p_descr->i_tag, dvbpsi_PMTESAddDescriptor( p_es, p_descr->i_tag,
p_descr->i_length, p_descr->p_data ); p_descr->i_length, p_descr->p_data );
} }
#endif /* _DVBPSI_DR_59_H_ */
continue; continue;
} }
......
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