Conflicts:
	configure.ac
	examples/decode_mpeg.c
	examples/get_pcr_pid.c
	src/Makefile.am
	src/demux.h
	src/dvbpsi.h
	src/dvbpsi_private.h
	src/psi.h
	src/tables/bat.h
	src/tables/bat_private.h
	src/tables/cat.h
	src/tables/cat_private.h
	src/tables/eit.h
	src/tables/eit_private.h
	src/tables/nit.h
	src/tables/nit_private.h
	src/tables/pat.h
	src/tables/pat_private.h
	src/tables/pmt.h
	src/tables/pmt_private.h
	src/tables/sdt.h
	src/tables/sdt_private.h
	src/tables/sis.h
	src/tables/sis_private.h
	src/tables/tot.h
	src/tables/tot_private.h