libdvbpsi: headers diff between 0.1.7 and 0.2.0 versions

	descriptor.h	descriptor.h
	/************************************************************************ *	/************************************************************************ *
	* descriptor.h	* descriptor.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: descriptor.h 88 2004-02-24 14:31:18Z sam $	* $Id: descriptor.h,v 1.5 2002/05/08 13:00:40 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <descriptor.h>	* \file <descriptor.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Common descriptor tools.	* \brief Common descriptor tools.
	*	*
	* Descriptor structure and its Manipulation tools.	* Descriptor structure and its Manipulation tools.
	*/	*/

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr.h	dr.h
	/************************************************************************ *	/************************************************************************ *
	* dr.h	* dr.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr.h 173 2008-04-26 12:12:06Z jpsaman $	* $Id$
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr.h>	* \file <dr.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Gather all dr_*.h into one.	* \brief Gather all dr_*.h into one.
	*	*
	* Gathers all dr_*.h into one. Use this header if you need a lot of them.	* Gathers all dr_*.h into one. Use this header if you need a lot of them.
	*/	*/

	skipping to change at line 51	skipping to change at line 51
	#include "dr_08.h"	#include "dr_08.h"
	#include "dr_09.h"	#include "dr_09.h"
	#include "dr_0a.h"	#include "dr_0a.h"
	#include "dr_0b.h"	#include "dr_0b.h"
	#include "dr_0c.h"	#include "dr_0c.h"
	#include "dr_0d.h"	#include "dr_0d.h"
	#include "dr_0e.h"	#include "dr_0e.h"
	#include "dr_0f.h"	#include "dr_0f.h"
	#include "dr_42.h"	#include "dr_42.h"
	#include "dr_43.h"	#include "dr_43.h"

		#include "dr_44.h"
	#include "dr_45.h"	#include "dr_45.h"
	#include "dr_47.h"	#include "dr_47.h"
	#include "dr_48.h"	#include "dr_48.h"
	#include "dr_4d.h"	#include "dr_4d.h"
	#include "dr_4e.h"	#include "dr_4e.h"
	#include "dr_52.h"	#include "dr_52.h"
	#include "dr_55.h"	#include "dr_55.h"
	#include "dr_56.h"	#include "dr_56.h"
	#include "dr_58.h"	#include "dr_58.h"
	#include "dr_59.h"	#include "dr_59.h"
	#include "dr_5a.h"	#include "dr_5a.h"
	#include "dr_69.h"	#include "dr_69.h"

		#include "dr_8a.h"

	#else	#else
	#error "Multiple inclusions of dr.h"	#error "Multiple inclusions of dr.h"
	#endif	#endif

End of changes. 7 change blocks.
	13 lines changed or deleted	15 lines changed or added

	dr_02.h	dr_02.h
	/************************************************************************ *	/************************************************************************ *
	* dr_02.h	* dr_02.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_02.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_02.h,v 1.3 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_02.h>	* \file <dr_02.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "video stream" descriptor	* \brief Application interface for the MPEG 2 "video stream" descriptor
	* decoder and generator.	* decoder and generator.
	*	*
	* Application interface for the MPEG 2 "video stream" descriptor	* Application interface for the MPEG 2 "video stream" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_03.h	dr_03.h
	/************************************************************************ *	/************************************************************************ *
	* dr_03.h	* dr_03.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_03.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_03.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_03.h>	* \file <dr_03.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "audio stream" descriptor	* \brief Application interface for the MPEG 2 "audio stream" descriptor
	* decoder and generator.	* decoder and generator.
	*	*
	* Application interface for the MPEG 2 "audio stream" descriptor	* Application interface for the MPEG 2 "audio stream" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_04.h	dr_04.h
	/************************************************************************ *	/************************************************************************ *
	* dr_04.h	* dr_04.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_04.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_04.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_04.h>	* \file <dr_04.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "hierarchy" descriptor	* \brief Application interface for the MPEG 2 "hierarchy" descriptor
	* decoder and generator.	* decoder and generator.
	*	*
	* Application interface for the MPEG 2 "hierarchy" descriptor	* Application interface for the MPEG 2 "hierarchy" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_05.h	dr_05.h
	/************************************************************************ *	/************************************************************************ *
	* dr_05.h	* dr_05.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_05.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_05.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_05.h>	* \file <dr_05.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "registration" descriptor	* \brief Application interface for the MPEG 2 "registration" descriptor
	* decoder and generator.	* decoder and generator.
	*	*
	* Application interface for the MPEG 2 "registration" descriptor	* Application interface for the MPEG 2 "registration" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_0d.h	dr_0d.h
	/************************************************************************ *	/************************************************************************ *
	* dr_0d.h	* dr_0d.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_0d.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_0d.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_0d.h>	* \file <dr_0d.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "copyright" descriptor	* \brief Application interface for the MPEG 2 "copyright" descriptor
	* decoder and generator.	* decoder and generator.
	*	*
	* Application interface for the MPEG 2 "copyright" descriptor	* Application interface for the MPEG 2 "copyright" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_0e.h	dr_0e.h
	/************************************************************************ *	/************************************************************************ *
	* dr_0e.h	* dr_0e.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_0e.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_0e.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_0e.h>	* \file <dr_0e.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "maximum bitrate" descriptor	* \brief Application interface for the MPEG 2 "maximum bitrate" descriptor
	* decoder and generator.	* decoder and generator.
	*	*
	* Application interface for the MPEG 2 "maximum bitrate" descriptor	* Application interface for the MPEG 2 "maximum bitrate" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_43.h	dr_43.h
	/************************************************************************ *	/************************************************************************ *
	* dr_43.h	* dr_43.h

	* (c)2001-2008 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_43.h 171 2008-04-26 12:09:45Z jpsaman $	* $Id$
	*	*
	* Authors: Johann Hanne	* Authors: Johann Hanne
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_43.h>	* \file <dr_43.h>
	* \author Johann Hanne	* \author Johann Hanne
	* \brief Application interface for the DVB satellite delivery system	* \brief Application interface for the DVB satellite delivery system
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the DVB satellite delivery system descriptor	* Application interface for the DVB satellite delivery system descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_45.h	dr_45.h
	/************************************************************************ *	/************************************************************************ *
	* dr_45.h	* dr_45.h

	* (c)2004-2007 VideoLAN	* Copyright (C) 2004-2010 VideoLAN
	* $Id: dr_45.h 162 2007-12-18 11:39:10Z jpsaman $	* $Id$
	*	*

	* Authors: Jean-Paul Saman <jpsaman at videolan dot org>	* Authors: Jean-Paul Saman <jpsaman@videolan.org>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_45.h>	* \file <dr_45.h>
	* \author Jean-Paul Saman <jpsaman at videolan dot org>	* \author Jean-Paul Saman <jpsaman at videolan dot org>
	* \brief VBI data descriptor parsing.	* \brief VBI data descriptor parsing.
	*	*
	* DVB VBI data descriptor parsing, according to ETSI EN 300 468	* DVB VBI data descriptor parsing, according to ETSI EN 300 468
	* version 1.7.1 section 6.2.46	* version 1.7.1 section 6.2.46

End of changes. 6 change blocks.
	14 lines changed or deleted	14 lines changed or added

	dr_58.h	dr_58.h
	/************************************************************************ *	/************************************************************************ *
	* dr_58.h	* dr_58.h

	* (c)2001-2008 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_58.h 172 2008-04-26 12:10:54Z jpsaman $	* $Id$
	*	*
	* Authors: Johann Hanne	* Authors: Johann Hanne
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_58.h>	* \file <dr_58.h>
	* \author Johann Hanne	* \author Johann Hanne
	* \brief Application interface for the DVB "local time offset"	* \brief Application interface for the DVB "local time offset"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the DVB "local time offset" descriptor	* Application interface for the DVB "local time offset" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_59.h	dr_59.h
	/************************************************************************ *	/************************************************************************ *
	* dr_59.h	* dr_59.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_59.h 93 2004-10-19 19:17:49Z massiot $	* $Id$
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* Tristan Leteurtre <tristan.leteurtre@anevia.com>	* Tristan Leteurtre <tristan.leteurtre@anevia.com>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_59.h>	* \file <dr_59.h>
	* \author Tristan Leteurtre <tristan.leteurtre@anevia.com>	* \author Tristan Leteurtre <tristan.leteurtre@anevia.com>
	* \brief DVB subtitling descriptor parsing.	* \brief DVB subtitling descriptor parsing.
	*	*
	* DVB subtitling descriptor parsing, according to ETSI EN 300 468	* DVB subtitling descriptor parsing, according to ETSI EN 300 468
	* section 6.2.36.	* section 6.2.36.

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_5a.h	dr_5a.h
	/************************************************************************ *	/************************************************************************ *
	* dr_5a.h	* dr_5a.h

	* (c)2001-2008 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_5a.h 173 2008-04-26 12:12:06Z jpsaman $	* $Id$
	*	*
	* Authors: Johann Hanne	* Authors: Johann Hanne
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_5a.h>	* \file <dr_5a.h>
	* \author Johann Hanne	* \author Johann Hanne
	* \brief Application interface for the DVB terrestrial delivery system	* \brief Application interface for the DVB terrestrial delivery system
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the DVB terrestrial delivery system descriptor	* Application interface for the DVB terrestrial delivery system descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	psi.h	psi.h
	/************************************************************************ *	/************************************************************************ *
	* psi.h	* psi.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: psi.h 88 2004-02-24 14:31:18Z sam $	* $Id: psi.h,v 1.6 2002/04/02 17:55:30 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <psi.h>	* \file <psi.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Common PSI tools.	* \brief Common PSI tools.
	*	*
	* PSI section structure and its Manipulation tools.	* PSI section structure and its Manipulation tools.
	*/	*/

	skipping to change at line 133	skipping to change at line 133
	* dvbpsi_ValidPSISection	* dvbpsi_ValidPSISection
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn int dvbpsi_ValidPSISection(dvbpsi_psi_section_t* p_section)	* \fn int dvbpsi_ValidPSISection(dvbpsi_psi_section_t* p_section)
	* \brief Validity check of a PSI section.	* \brief Validity check of a PSI section.
	* \param p_section pointer to the PSI section structure	* \param p_section pointer to the PSI section structure
	* \return boolean value (0 if the section is not valid).	* \return boolean value (0 if the section is not valid).
	*	*
	* Check the CRC_32 if the section has b_syntax_indicator set.	* Check the CRC_32 if the section has b_syntax_indicator set.
	*/	*/

		__attribute__((deprecated))
	int dvbpsi_ValidPSISection(dvbpsi_psi_section_t* p_section);	int dvbpsi_ValidPSISection(dvbpsi_psi_section_t* p_section);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_BuildPSISection	* dvbpsi_BuildPSISection
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_BuildPSISection(dvbpsi_psi_section_t* p_section)	* \fn void dvbpsi_BuildPSISection(dvbpsi_psi_section_t* p_section)
	* \brief Build a valid section based on the information in the structure.	* \brief Build a valid section based on the information in the structure.
	* \param p_section pointer to the PSI section structure	* \param p_section pointer to the PSI section structure
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_BuildPSISection(dvbpsi_psi_section_t* p_section);	void dvbpsi_BuildPSISection(dvbpsi_psi_section_t* p_section);

	#ifdef __cplusplus	#ifdef __cplusplus
	};	};
	#endif	#endif

	#else	#else
	#error "Multiple inclusions of psi.h"	#error "Multiple inclusions of psi.h"
	#endif	#endif

End of changes. 7 change blocks.
	13 lines changed or deleted	15 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	cat.h	cat.h
	/************************************************************************ *	/************************************************************************ *
	* cat.h	* cat.h

	* (c)2001-2007 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: cat.h 187 2009-11-18 07:26:10Z md $	* $Id$
	*	*
	* Authors: Johann Hanne	* Authors: Johann Hanne
	* heavily based on pmt.h which was written by	* heavily based on pmt.h which was written by
	* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <cat.h>	* \file <cat.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the CAT decoder and the CAT generator.	* \brief Application interface for the CAT decoder and the CAT generator.
	*	*
	* Application interface for the CAT decoder and the CAT generator.	* Application interface for the CAT decoder and the CAT generator.
	* New decoded CAT tables are sent by callback to the application.	* New decoded CAT tables are sent by callback to the application.

	skipping to change at line 86	skipping to change at line 86
	* dvbpsi_AttachCAT	* dvbpsi_AttachCAT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback,	* \fn dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback,
	void* p_cb_data)	void* p_cb_data)
	* \brief Creation and initialization of a CAT decoder.	* \brief Creation and initialization of a CAT decoder.
	* \param pf_callback function to call back on new CAT	* \param pf_callback function to call back on new CAT
	* \param p_cb_data private data given in argument to the callback	* \param p_cb_data private data given in argument to the callback
	* \return a pointer to the decoder for future calls.	* \return a pointer to the decoder for future calls.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback,	dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback,
	void* p_cb_data);	void* p_cb_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DetachCAT	* dvbpsi_DetachCAT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_DetachCAT(dvbpsi_handle h_dvbpsi)	* \fn void dvbpsi_DetachCAT(dvbpsi_handle h_dvbpsi)
	* \brief Destroy a CAT decoder.	* \brief Destroy a CAT decoder.
	* \param h_dvbpsi handle to the decoder	* \param h_dvbpsi handle to the decoder
	* \return nothing.	* \return nothing.
	*	*
	* The handle isn't valid any more.	* The handle isn't valid any more.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_DetachCAT(dvbpsi_handle h_dvbpsi);	void dvbpsi_DetachCAT(dvbpsi_handle h_dvbpsi);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_InitCAT/dvbpsi_NewCAT	* dvbpsi_InitCAT/dvbpsi_NewCAT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_InitCAT(dvbpsi_cat_t* p_cat,	* \fn void dvbpsi_InitCAT(dvbpsi_cat_t* p_cat,
	uint8_t i_version, int b_current_next)	uint8_t i_version, int b_current_next)
	* \brief Initialize a user-allocated dvbpsi_cat_t structure.	* \brief Initialize a user-allocated dvbpsi_cat_t structure.
	* \param p_cat pointer to the CAT structure	* \param p_cat pointer to the CAT structure
	* \param i_version CAT version	* \param i_version CAT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_InitCAT(dvbpsi_cat_t* p_cat,	void dvbpsi_InitCAT(dvbpsi_cat_t* p_cat,
	uint8_t i_version, int b_current_next);	uint8_t i_version, int b_current_next);

	/*!	/*!
	* \def dvbpsi_NewCAT(p_cat,	* \def dvbpsi_NewCAT(p_cat,
	i_version, b_current_next)	i_version, b_current_next)
	* \brief Allocate and initialize a new dvbpsi_cat_t structure.	* \brief Allocate and initialize a new dvbpsi_cat_t structure.
	* \param p_cat pointer to the CAT structure	* \param p_cat pointer to the CAT structure
	* \param i_version CAT version	* \param i_version CAT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator

	skipping to change at line 143	skipping to change at line 146

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_EmptyCAT/dvbpsi_DeleteCAT	* dvbpsi_EmptyCAT/dvbpsi_DeleteCAT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_EmptyCAT(dvbpsi_cat_t* p_cat)	* \fn void dvbpsi_EmptyCAT(dvbpsi_cat_t* p_cat)
	* \brief Clean a dvbpsi_cat_t structure.	* \brief Clean a dvbpsi_cat_t structure.
	* \param p_cat pointer to the CAT structure	* \param p_cat pointer to the CAT structure
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_EmptyCAT(dvbpsi_cat_t* p_cat);	void dvbpsi_EmptyCAT(dvbpsi_cat_t* p_cat);

	/*!	/*!
	* \def dvbpsi_DeleteCAT(p_cat)	* \def dvbpsi_DeleteCAT(p_cat)
	* \brief Clean and free a dvbpsi_cat_t structure.	* \brief Clean and free a dvbpsi_cat_t structure.
	* \param p_cat pointer to the CAT structure	* \param p_cat pointer to the CAT structure
	* \return nothing.	* \return nothing.
	*/	*/
	#define dvbpsi_DeleteCAT(p_cat) \	#define dvbpsi_DeleteCAT(p_cat) \
	do { \	do { \

	skipping to change at line 172	skipping to change at line 176
	uint8_t i_tag,	uint8_t i_tag,
	uint8_t i_length,	uint8_t i_length,
	uint8_t* p_data)	uint8_t* p_data)
	* \brief Add a descriptor in the CAT.	* \brief Add a descriptor in the CAT.
	* \param p_cat pointer to the CAT structure	* \param p_cat pointer to the CAT structure
	* \param i_tag descriptor's tag	* \param i_tag descriptor's tag
	* \param i_length descriptor's length	* \param i_length descriptor's length
	* \param p_data descriptor's data	* \param p_data descriptor's data
	* \return a pointer to the added descriptor.	* \return a pointer to the added descriptor.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_descriptor_t* dvbpsi_CATAddDescriptor(dvbpsi_cat_t* p_cat,	dvbpsi_descriptor_t* dvbpsi_CATAddDescriptor(dvbpsi_cat_t* p_cat,
	uint8_t i_tag, uint8_t i_lengt h,	uint8_t i_tag, uint8_t i_lengt h,
	uint8_t* p_data);	uint8_t* p_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenCATSections	* dvbpsi_GenCATSections
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_psi_section_t* dvbpsi_GenCATSections(dvbpsi_cat_t* p_cat)	* \fn dvbpsi_psi_section_t* dvbpsi_GenCATSections(dvbpsi_cat_t* p_cat)
	* \brief CAT generator	* \brief CAT generator
	* \param p_cat CAT structure	* \param p_cat CAT structure
	* \return a pointer to the list of generated PSI sections.	* \return a pointer to the list of generated PSI sections.
	*	*
	* Generate CAT sections based on the dvbpsi_cat_t structure.	* Generate CAT sections based on the dvbpsi_cat_t structure.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_psi_section_t* dvbpsi_GenCATSections(dvbpsi_cat_t* p_cat);	dvbpsi_psi_section_t* dvbpsi_GenCATSections(dvbpsi_cat_t* p_cat);

	#ifdef __cplusplus	#ifdef __cplusplus
	};	};
	#endif	#endif

	#else	#else
	#error "Multiple inclusions of cat.h"	#error "Multiple inclusions of cat.h"
	#endif	#endif

End of changes. 11 change blocks.
	13 lines changed or deleted	19 lines changed or added

	demux.h	demux.h
	/************************************************************************ *	/************************************************************************ *
	* demux.h	* demux.h

	* (c)2001-2002 VideoLAN	*
	* $Id: demux.h 108 2005-04-19 12:33:21Z gbazin $	* Copyright (C) 2001-2011 VideoLAN
		* $Id$
	*	*
	* Authors: Johan Bilien <jobi@via.ecp.fr>	* Authors: Johan Bilien <jobi@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <demux.h>	* \file <demux.h>
	* \author Johan Bilien <jobi@via.ecp.fr>	* \author Johan Bilien <jobi@via.ecp.fr>
	* \brief Subtable demutiplexor.	* \brief Subtable demutiplexor.
	*	*
	* Subtable demultiplexor structure	* Subtable demultiplexor structure
	*/	*/

	skipping to change at line 130	skipping to change at line 131
	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_AttachDemux	* dvbpsi_AttachDemux
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_handle_t dvbpsi_NewPSISection(dvbpsi_demux_new_cb_t pf_new_cb , void * p_new_cb_data)	* \fn dvbpsi_handle_t dvbpsi_NewPSISection(dvbpsi_demux_new_cb_t pf_new_cb , void * p_new_cb_data)
	* \brief Creates a new demux structure.	* \brief Creates a new demux structure.
	* \param pf_new_cb A callcack called when a new type of subtable is found.	* \param pf_new_cb A callcack called when a new type of subtable is found.
	* \param p_new_cb_data Data given to the previous callback.	* \param p_new_cb_data Data given to the previous callback.
	* \return a handle to the new demux structure.	* \return a handle to the new demux structure.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb,	dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb,
	void * p_new_cb_data);	void * p_new_cb_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DetachDemux	* dvbpsi_DetachDemux
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi)	* \fn void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi)
	* \brief Destroys a demux structure.	* \brief Destroys a demux structure.
	* \param h_dvbpsi The handle of the demux to be destroyed.	* \param h_dvbpsi The handle of the demux to be destroyed.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi);	void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_demuxGetSubDec	* dvbpsi_demuxGetSubDec
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t *, uint 8_t, uint16_t)	* \fn dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t *, uint 8_t, uint16_t)
	* \brief Looks for a subtable decoder, given the subtable ID.	* \brief Looks for a subtable decoder, given the subtable ID.
	* \param p_demux Pointer to the demux structure.	* \param p_demux Pointer to the demux structure.
	* \param i_table_id Table ID of the wanted subtable.	* \param i_table_id Table ID of the wanted subtable.
	* \param i_extension Table ID extension of the wanted subtable.	* \param i_extension Table ID extension of the wanted subtable.
	* \return a pointer to the found subdecoder, or NULL.	* \return a pointer to the found subdecoder, or NULL.
	*	*
	*/	*/

		__attribute__((deprecated))
	dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux,	dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux,
	uint8_t i_table_id,	uint8_t i_table_id,
	uint16_t i_extension) ;	uint16_t i_extension) ;
	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_Demux	* dvbpsi_Demux
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_Demux(dvbpsi_handle h_dvbpsi,	* \fn void dvbpsi_Demux(dvbpsi_handle h_dvbpsi,
	dvbpsi_psi_section_t * p_section)	dvbpsi_psi_section_t * p_section)
	* \brief Sends the PSI sections to the right subtable decoder according to their table ID and extension.	* \brief Sends the PSI sections to the right subtable decoder according to their table ID and extension.
	* \param h_dvbpsi PSI decoder handle.	* \param h_dvbpsi PSI decoder handle.
	* \param p_section PSI section.	* \param p_section PSI section.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_Demux(dvbpsi_handle h_dvbpsi,	void dvbpsi_Demux(dvbpsi_handle h_dvbpsi,
	dvbpsi_psi_section_t * p_section);	dvbpsi_psi_section_t * p_section);

	#ifdef __cplusplus	#ifdef __cplusplus
	};	};
	#endif	#endif

	#else	#else
	#error "Multiple inclusions of demux.h"	#error "Multiple inclusions of demux.h"
	#endif	#endif

End of changes. 9 change blocks.
	14 lines changed or deleted	18 lines changed or added

	dr_06.h	dr_06.h
	/************************************************************************ *	/************************************************************************ *
	* dr_06.h	* dr_06.h

	* (c)2001-2002 VideoLAN	* Copyright (C)2001-2010 VideoLAN
	* $Id: dr_06.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_06.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_06.h>	* \file <dr_06.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "data stream alignment"	* \brief Application interface for the MPEG 2 "data stream alignment"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "data stream alignment" descriptor	* Application interface for the MPEG 2 "data stream alignment" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_07.h	dr_07.h
	/************************************************************************ *	/************************************************************************ *
	* dr_07.h	* dr_07.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_07.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_07.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_07.h>	* \file <dr_07.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "target background grid"	* \brief Application interface for the MPEG 2 "target background grid"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "target background grid" descriptor	* Application interface for the MPEG 2 "target background grid" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_08.h	dr_08.h
	/************************************************************************ *	/************************************************************************ *
	* dr_08.h	* dr_08.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_08.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_08.h,v 1.3 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_08.h>	* \file <dr_08.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "video window"	* \brief Application interface for the MPEG 2 "video window"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "video window" descriptor	* Application interface for the MPEG 2 "video window" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_09.h	dr_09.h
	/************************************************************************ *	/************************************************************************ *
	* dr_09.h	* dr_09.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_09.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_09.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_09.h>	* \file <dr_09.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "conditional access"	* \brief Application interface for the MPEG 2 "conditional access"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "conditional access" descriptor	* Application interface for the MPEG 2 "conditional access" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_0a.h	dr_0a.h
	/************************************************************************ *	/************************************************************************ *
	* dr_0a.h	* dr_0a.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_0a.h 132 2006-07-18 08:34:12Z sigmunau $	* $Id$
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_0a.h>	* \file <dr_0a.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "ISO 639 language"	* \brief Application interface for the MPEG 2 "ISO 639 language"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "ISO 639 language" descriptor	* Application interface for the MPEG 2 "ISO 639 language" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_0b.h	dr_0b.h
	/************************************************************************ *	/************************************************************************ *
	* dr_0b.h	* dr_0b.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_0b.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_0b.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_0b.h>	* \file <dr_0b.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "system clock"	* \brief Application interface for the MPEG 2 "system clock"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "system clock" descriptor	* Application interface for the MPEG 2 "system clock" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_0c.h	dr_0c.h
	/************************************************************************ *	/************************************************************************ *
	* dr_0c.h	* dr_0c.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_0c.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_0c.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_0c.h>	* \file <dr_0c.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "multiplex buffer utilizatio n"	* \brief Application interface for the MPEG 2 "multiplex buffer utilizatio n"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "multiplex buffer utilization"	* Application interface for the MPEG 2 "multiplex buffer utilization"

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_0f.h	dr_0f.h
	/************************************************************************ *	/************************************************************************ *
	* dr_0f.h	* dr_0f.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_0f.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_0f.h,v 1.2 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_0f.h>	* \file <dr_0f.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the MPEG 2 "private data indicator"	* \brief Application interface for the MPEG 2 "private data indicator"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "private data indicator" descriptor	* Application interface for the MPEG 2 "private data indicator" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_42.h	dr_42.h
	/************************************************************************ *	/************************************************************************ *
	* dr_42.h	* dr_42.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_42.h 147 2007-10-11 06:46:25Z jpsaman $	* $Id$
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* Johan Bilien <jobi@via.ecp.fr>	* Johan Bilien <jobi@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_42.h>	* \file <dr_42.h>
	* \author Johan Bilien <jobi@via.ecp.fr>	* \author Johan Bilien <jobi@via.ecp.fr>
	* \brief Application interface for the DVB "stuffing"	* \brief Application interface for the DVB "stuffing"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the DVB "stuffing" descriptor	* Application interface for the DVB "stuffing" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_47.h	dr_47.h
	/************************************************************************ *	/************************************************************************ *
	* dr_47.h	* dr_47.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_47.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_47.h,v 1.2 2002/12/12 10:19:32 jobi Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* Johan Bilien <jobi@via.ecp.fr>	* Johan Bilien <jobi@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_47.h>	* \file <dr_47.h>
	* \author Johan Bilien <jobi@via.ecp.fr>	* \author Johan Bilien <jobi@via.ecp.fr>
	* \brief Application interface for the DVB "bouquet name"	* \brief Application interface for the DVB "bouquet name"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 "bouquet name" descriptor	* Application interface for the MPEG 2 "bouquet name" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_48.h	dr_48.h
	/************************************************************************ *	/************************************************************************ *
	* dr_48.h	* dr_48.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2010 VideoLAN
	* $Id: dr_48.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_48.h,v 1.2 2002/12/12 10:19:32 jobi Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* Johan Bilien <jobi@via.ecp.fr>	* Johan Bilien <jobi@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_48.h>	* \file <dr_48.h>
	* \author Johan Bilien <jobi@via.ecp.fr>	* \author Johan Bilien <jobi@via.ecp.fr>
	* \brief Application interface for the DVB "service"	* \brief Application interface for the DVB "service"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the DVB "service" descriptor	* Application interface for the DVB "service" descriptor

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_4d.h	dr_4d.h
	/************************************************************************ *	/************************************************************************ *
	* dr_4d.h	* dr_4d.h

	* (c)2005 VideoLAN	* Copyright (C) 2005-2010 VideoLAN
	* $Id: dr_4d.h,v 1.3 2002/05/10 23:50:36 bozo Exp $	* $Id: dr_4d.h,v 1.3 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Laurent Aimar <fenrir@via.ecp.fr>	* Authors: Laurent Aimar <fenrir@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_4d.h>	* \file <dr_4d.h>
	* \author Laurent Aimar <fenrir@via.ecp.fr>	* \author Laurent Aimar <fenrir@via.ecp.fr>
	* \brief Application interface for the "Short event" descriptor	* \brief Application interface for the "Short event" descriptor
	* decoder and generator.	* decoder and generator.
	*	*
	* Application interface for the "Short event" descriptor	* Application interface for the "Short event" descriptor

End of changes. 5 change blocks.
	12 lines changed or deleted	12 lines changed or added

	dr_4e.h	dr_4e.h
	/************************************************************************ *	/************************************************************************ *
	* dr_4e.h	* dr_4e.h

	* (c)2005 VideoLAN	* Copyright (C) 2005-2010 VideoLAN
	* $Id: dr_4d.h,v 1.3 2002/05/10 23:50:36 bozo Exp $	* $Id: dr_4d.h,v 1.3 2002/05/10 23:50:36 bozo Exp $
	*	*
	* Authors: Laurent Aimar <fenrir@via.ecp.fr>	* Authors: Laurent Aimar <fenrir@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_4e.h>	* \file <dr_4e.h>
	* \author Laurent Aimar <fenrir@via.ecp.fr>	* \author Laurent Aimar <fenrir@via.ecp.fr>
	* \brief Application interface for the "Extended event" descriptor	* \brief Application interface for the "Extended event" descriptor
	* decoder and generator.	* decoder and generator.
	*	*
	* Application interface for the "Extended event" descriptor	* Application interface for the "Extended event" descriptor

End of changes. 5 change blocks.
	12 lines changed or deleted	12 lines changed or added

	dr_52.h	dr_52.h
	/************************************************************************ *	/************************************************************************ *
	* dr_52.h	* dr_52.h

	* (c)2005 Andrew John Hughes	* Copyright (C) 2005-2010 Andrew John Hughes
	*	*
	* Authors: Andrew John Hughes <gnu_andrew@member.fsf.org>	* Authors: Andrew John Hughes <gnu_andrew@member.fsf.org>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_52.h>	* \file <dr_52.h>
	* \author Andrew John Hughes <gnu_andrew@member.fsf.org>	* \author Andrew John Hughes <gnu_andrew@member.fsf.org>
	* \brief Application interface for the DVB "stream identifier"	* \brief Application interface for the DVB "stream identifier"
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the DVB "stream identifier" descriptor	* Application interface for the DVB "stream identifier" descriptor

	skipping to change at line 72	skipping to change at line 72
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_stream_identifier_dr_t * dvbpsi_DecodeStreamIdentifierDr(	* \fn dvbpsi_stream_identifier_dr_t * dvbpsi_DecodeStreamIdentifierDr(
	dvbpsi_descriptor_t * p_descriptor)	dvbpsi_descriptor_t * p_descriptor)
	* \brief "stream identifier" descriptor decoder.	* \brief "stream identifier" descriptor decoder.
	* \param p_descriptor pointer to the descriptor structure	* \param p_descriptor pointer to the descriptor structure
	* \return a pointer to a new "stream identifier" descriptor structure	* \return a pointer to a new "stream identifier" descriptor structure
	* which contains the decoded data.	* which contains the decoded data.
	*/	*/
	dvbpsi_stream_identifier_dr_t* dvbpsi_DecodeStreamIdentifierDr(	dvbpsi_stream_identifier_dr_t* dvbpsi_DecodeStreamIdentifierDr(

	dvbpsi_descriptor_t * p_descriptor);	dvbpsi_descriptor_t * p_descriptor);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenStreamIdentifierDr	* dvbpsi_GenStreamIdentifierDr
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_descriptor_t * dvbpsi_GenStreamIdentifierDr(	* \fn dvbpsi_descriptor_t * dvbpsi_GenStreamIdentifierDr(
	dvbpsi_service_dr_t * p_decoded, int b_duplicate)	dvbpsi_service_dr_t * p_decoded, int b_duplicate)
	* \brief "stream identifier" descriptor generator.	* \brief "stream identifier" descriptor generator.
	* \param p_decoded pointer to a decoded "stream identifier" descriptor	* \param p_decoded pointer to a decoded "stream identifier" descriptor
	* structure	* structure

End of changes. 6 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dr_55.h	dr_55.h
	/************************************************************************ *	/************************************************************************ *
	* dr_55.h	* dr_55.h

	* (c)2004 VideoLAN	* Copyright (C) 2004-2010 VideoLAN
	* $Id: dr_55.h 88 2004-02-24 14:31:18Z sam $	* $Id: dr_55.h 88 2004-02-24 14:31:18Z sam $
	*	*
	* Authors: Christophe Massiot <massiot@via.ecp.fr>	* Authors: Christophe Massiot <massiot@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_55.h>	* \file <dr_55.h>
	* \author Christophe Massiot <massiot@via.ecp.fr>	* \author Christophe Massiot <massiot@via.ecp.fr>
	* \brief Parental rating descriptor parsing.	* \brief Parental rating descriptor parsing.
	*	*
	* Parental rating descriptor parsing, according to ETSI EN 300 468	* Parental rating descriptor parsing, according to ETSI EN 300 468
	* section 6.2.26.	* section 6.2.26.

End of changes. 5 change blocks.
	12 lines changed or deleted	12 lines changed or added

	dr_56.h	dr_56.h
	/************************************************************************ *	/************************************************************************ *
	* dr_56.h	* dr_56.h

	* (c)2004-2007 VideoLAN	* Copyright (C) 2004-2010 VideoLAN
	* $Id: dr_56.h 93 2004-10-19 19:17:49Z massiot $	* $Id: dr_56.h 93 2004-10-19 19:17:49Z massiot $
	*	*
	* Authors: Derk-Jan Hartman <hartman at videolan dot org>	* Authors: Derk-Jan Hartman <hartman at videolan dot org>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_56.h>	* \file <dr_56.h>
	* \author Derk-Jan Hartman <hartman at videolan dot org>	* \author Derk-Jan Hartman <hartman at videolan dot org>
	* \brief EBU Teletext descriptor parsing.	* \brief EBU Teletext descriptor parsing.
	*	*
	* DVB EBU Teletext descriptor parsing, according to ETSI EN 300 468	* DVB EBU Teletext descriptor parsing, according to ETSI EN 300 468
	* version 1.7.1 section 6.2.42 and 6.2.47.	* version 1.7.1 section 6.2.42 and 6.2.47.

End of changes. 5 change blocks.
	12 lines changed or deleted	12 lines changed or added

	dr_69.h	dr_69.h
	/************************************************************************ *	/************************************************************************ *
	* dr_69.h	* dr_69.h

	* (c)2007 VideoLAN	* Copyright (C) 2007-2010 VideoLAN
	* $Id: dr_69.h 153 2007-10-12 21:05:05Z jpsaman $	* $Id$
	*	*
	* Authors: Pinkava Jiri <master_up@post.cz>	* Authors: Pinkava Jiri <master_up@post.cz>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dr_69.h>	* \file <dr_69.h>
	* \author Jiri Pinkava <master_up@post.cz>	* \author Jiri Pinkava <master_up@post.cz>
	* \brief Application interface for the PDC (Programme Delivery Control)	* \brief Application interface for the PDC (Programme Delivery Control)
	* descriptor decoder and generator.	* descriptor decoder and generator.
	*	*
	* Application interface for the MPEG 2 TS PDC descriptor decoder and gener ator	* Application interface for the MPEG 2 TS PDC descriptor decoder and gener ator

End of changes. 5 change blocks.
	13 lines changed or deleted	13 lines changed or added

	dvbpsi.h	dvbpsi.h
	/************************************************************************ *	/************************************************************************ *
	* dvbpsi.h	* dvbpsi.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: dvbpsi.h 165 2007-12-18 13:06:43Z jpsaman $	* $Id$
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <dvbpsi.h>	* \file <dvbpsi.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for all DVB/PSI decoders.	* \brief Application interface for all DVB/PSI decoders.
	*	*
	* Application interface for all DVB/PSI decoders. The generic decoder	* Application interface for all DVB/PSI decoders. The generic decoder
	* structure is public so that external decoders are allowed.	* structure is public so that external decoders are allowed.
	*/	*/

	#ifndef _DVBPSI_DVBPSI_H_	#ifndef _DVBPSI_DVBPSI_H_
	#define _DVBPSI_DVBPSI_H_	#define _DVBPSI_DVBPSI_H_


	#define DVBPSI_VERSION 0.1.7	#define DVBPSI_VERSION 0.2.0
	#define DVBPSI_VERSION_INT ((0<<16)+(1<<8)+7)	#define DVBPSI_VERSION_INT ((0<<16)+(2<<8)+0)

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_handle	* dvbpsi_handle
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \typedef struct dvbpsi_decoder_s * dvbpsi_handle	* \typedef struct dvbpsi_decoder_s * dvbpsi_handle
	* \brief Decoder abstration.	* \brief Decoder abstration.
	*/	*/

	typedef struct dvbpsi_decoder_s * dvbpsi_handle;	typedef struct dvbpsi_decoder_s * dvbpsi_handle __attribute__((depreceated) );

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_PushPacket	* dvbpsi_PushPacket
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_PushPacket(dvbpsi_handle h_dvbpsi, uint8_t* p_data)	* \fn void dvbpsi_PushPacket(dvbpsi_handle h_dvbpsi, uint8_t* p_data)
	* \brief Injection of a TS packet into a PSI decoder.	* \brief Injection of a TS packet into a PSI decoder.
	* \param h_dvbpsi handle to the decoder	* \param h_dvbpsi handle to the decoder
	* \param p_data pointer to a 188 bytes playload of a TS packet	* \param p_data pointer to a 188 bytes playload of a TS packet
	* \return nothing.	* \return nothing.
	*	*
	* Injection of a TS packet into a PSI decoder.	* Injection of a TS packet into a PSI decoder.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_PushPacket(dvbpsi_handle h_dvbpsi, uint8_t* p_data);	void dvbpsi_PushPacket(dvbpsi_handle h_dvbpsi, uint8_t* p_data);

	/************************************************************************ *	/************************************************************************ *
	* The following definitions are just here to allow external decoders but	* The following definitions are just here to allow external decoders but
	* shouldn't be used for any other purpose.	* shouldn't be used for any other purpose.
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \typedef struct dvbpsi_psi_section_s dvbpsi_psi_section_t	* \typedef struct dvbpsi_psi_section_s dvbpsi_psi_section_t
	* \brief dvbpsi_psi_section_t type definition.	* \brief dvbpsi_psi_section_t type definition.

End of changes. 8 change blocks.
	16 lines changed or deleted	17 lines changed or added

	eit.h	eit.h
	/************************************************************************ *	/************************************************************************ *
	* eit.h	* eit.h

	* (c)2004 VideoLAN	* Copyright (C) 2004-2011 VideoLAN
	* $Id: eit.h 88 2004-02-24 14:31:18Z sam $	* $Id: eit.h 88 2004-02-24 14:31:18Z sam $
	*	*
	* Authors: Christophe Massiot <massiot@via.ecp.fr>	* Authors: Christophe Massiot <massiot@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <eit.h>	* \file <eit.h>
	* \author Christophe Massiot <massiot@via.ecp.fr>	* \author Christophe Massiot <massiot@via.ecp.fr>
	* \brief Application interface for the EIT decoder and the EIT generator.	* \brief Application interface for the EIT decoder and the EIT generator.
	*	*
	* Application interface for the EIT decoder and the EIT generator.	* Application interface for the EIT decoder and the EIT generator.
	* New decoded EIT tables are sent by callback to the application.	* New decoded EIT tables are sent by callback to the application.

	skipping to change at line 124	skipping to change at line 124
	uint16_t i_extension, dvbpsi_eit_callback pf_callback,	uint16_t i_extension, dvbpsi_eit_callback pf_callback,
	void* p_cb_data)	void* p_cb_data)
	* \brief Creation and initialization of a EIT decoder.	* \brief Creation and initialization of a EIT decoder.
	* \param p_demux Subtable demultiplexor to which the decoder is attached.	* \param p_demux Subtable demultiplexor to which the decoder is attached.
	* \param i_table_id Table ID, 0x4E, 0x4F, or 0x50-0x6F.	* \param i_table_id Table ID, 0x4E, 0x4F, or 0x50-0x6F.
	* \param i_extension Table ID extension, here service ID.	* \param i_extension Table ID extension, here service ID.
	* \param pf_callback function to call back on new EIT.	* \param pf_callback function to call back on new EIT.
	* \param p_cb_data private data given in argument to the callback.	* \param p_cb_data private data given in argument to the callback.
	* \return 0 if everything went ok.	* \return 0 if everything went ok.
	*/	*/

		__attribute__((deprecated))
	int dvbpsi_AttachEIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,	int dvbpsi_AttachEIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
	uint16_t i_extension, dvbpsi_eit_callback pf_callback,	uint16_t i_extension, dvbpsi_eit_callback pf_callback,
	void* p_cb_data);	void* p_cb_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DetachEIT	* dvbpsi_DetachEIT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,	* \fn void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
	uint16_t i_extension)	uint16_t i_extension)
	* \brief Destroy a EIT decoder.	* \brief Destroy a EIT decoder.
	* \param p_demux Subtable demultiplexor to which the decoder is attached.	* \param p_demux Subtable demultiplexor to which the decoder is attached.
	* \param i_table_id Table ID, 0x4E, 0x4F, or 0x50-0x6F.	* \param i_table_id Table ID, 0x4E, 0x4F, or 0x50-0x6F.
	* \param i_extension Table ID extension, here service ID.	* \param i_extension Table ID extension, here service ID.
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,	void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
	uint16_t i_extension);	uint16_t i_extension);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_InitEIT/dvbpsi_NewEIT	* dvbpsi_InitEIT/dvbpsi_NewEIT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id,	* \fn void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id,
	uint8_t i_version, int b_current_next, uint16_t i_ts_id,	uint8_t i_version, int b_current_next, uint16_t i_ts_id,
	uint16_t i_network_id, uint8_t i_segment_last_section_number,	uint16_t i_network_id, uint8_t i_segment_last_section_number,

	skipping to change at line 162	skipping to change at line 164
	* \param p_eit pointer to the EIT structure	* \param p_eit pointer to the EIT structure
	* \param i_service_id service ID	* \param i_service_id service ID
	* \param i_version EIT version	* \param i_version EIT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator
	* \param i_ts_id transport stream ID	* \param i_ts_id transport stream ID
	* \param i_network_id original network id	* \param i_network_id original network id
	* \param i_segment_last_section_number segment_last_section_number	* \param i_segment_last_section_number segment_last_section_number
	* \param i_last_table_id i_last_table_id	* \param i_last_table_id i_last_table_id
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id, uint8_t i_v ersion,	void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id, uint8_t i_v ersion,
	int b_current_next, uint16_t i_ts_id, uint16_t i_networ k_id,	int b_current_next, uint16_t i_ts_id, uint16_t i_networ k_id,
	uint8_t i_segment_last_section_number,	uint8_t i_segment_last_section_number,
	uint8_t i_last_table_id);	uint8_t i_last_table_id);

	/*!	/*!
	* \def dvbpsi_NewEIT(p_eit, i_ts_id, i_version, b_current_next, i_network_ id)	* \def dvbpsi_NewEIT(p_eit, i_ts_id, i_version, b_current_next, i_network_ id)
	* \brief Allocate and initialize a new dvbpsi_eit_t structure.	* \brief Allocate and initialize a new dvbpsi_eit_t structure.
	* \param p_eit pointer to the EIT structure	* \param p_eit pointer to the EIT structure
	* \param i_ts_id transport stream ID	* \param i_ts_id transport stream ID

	skipping to change at line 193	skipping to change at line 196

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_EmptyEIT/dvbpsi_DeleteEIT	* dvbpsi_EmptyEIT/dvbpsi_DeleteEIT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit)	* \fn void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit)
	* \brief Clean a dvbpsi_eit_t structure.	* \brief Clean a dvbpsi_eit_t structure.
	* \param p_eit pointer to the EIT structure	* \param p_eit pointer to the EIT structure
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit);	void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit);

	/*!	/*!
	* \def dvbpsi_DeleteEIT(p_eit)	* \def dvbpsi_DeleteEIT(p_eit)
	* \brief Clean and free a dvbpsi_eit_t structure.	* \brief Clean and free a dvbpsi_eit_t structure.
	* \param p_eit pointer to the EIT structure	* \param p_eit pointer to the EIT structure
	* \return nothing.	* \return nothing.
	*/	*/
	#define dvbpsi_DeleteEIT(p_eit) \	#define dvbpsi_DeleteEIT(p_eit) \
	do { \	do { \

	skipping to change at line 245	skipping to change at line 249
	dvbpsi_eit_event_t* p_event,	dvbpsi_eit_event_t* p_event,
	uint8_t i_tag, uint8_t i_len gth,	uint8_t i_tag, uint8_t i_len gth,
	uint8_t* p_data)	uint8_t* p_data)
	* \brief Add a descriptor to the EIT event.	* \brief Add a descriptor to the EIT event.
	* \param p_event pointer to the EIT event structure	* \param p_event pointer to the EIT event structure
	* \param i_tag descriptor's tag	* \param i_tag descriptor's tag
	* \param i_length descriptor's length	* \param i_length descriptor's length
	* \param p_data descriptor's data	* \param p_data descriptor's data
	* \return a pointer to the added descriptor.	* \return a pointer to the added descriptor.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_descriptor_t* dvbpsi_EITEventAddDescriptor(	dvbpsi_descriptor_t* dvbpsi_EITEventAddDescriptor(
	dvbpsi_eit_event_t* p_event,	dvbpsi_eit_event_t* p_event,
	uint8_t i_tag, uint8_t i_len gth,	uint8_t i_tag, uint8_t i_len gth,
	uint8_t* p_data);	uint8_t* p_data);

	#ifdef __cplusplus	#ifdef __cplusplus
	};	};
	#endif	#endif

	#else	#else

End of changes. 10 change blocks.
	12 lines changed or deleted	17 lines changed or added

	nit.h	nit.h
	/************************************************************************ *	/************************************************************************ *
	* nit.h	* nit.h

	* (c)2001-2008 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: nit.h 187 2009-11-18 07:26:10Z md $	* $Id$
	*	*
	* Authors: Johann Hanne	* Authors: Johann Hanne
	* heavily based on pmt.c which was written by	* heavily based on pmt.c which was written by
	* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <nit.h>	* \file <nit.h>
	* \author Johann Hanne	* \author Johann Hanne
	* \brief Application interface for the NIT decoder and the NIT generator.	* \brief Application interface for the NIT decoder and the NIT generator.
	*	*
	* Application interface for the NIT decoder and the NIT generator.	* Application interface for the NIT decoder and the NIT generator.
	* New decoded NIT tables are sent by callback to the application.	* New decoded NIT tables are sent by callback to the application.

	skipping to change at line 119	skipping to change at line 119
	uint16_t i_extension, dvbpsi_nit_callback pf_c allback,	uint16_t i_extension, dvbpsi_nit_callback pf_c allback,
	void* p_cb_data)	void* p_cb_data)
	* \brief Creation and initialization of a NIT decoder.	* \brief Creation and initialization of a NIT decoder.
	* \param p_demux Subtable demultiplexor to which the decoder is attached.	* \param p_demux Subtable demultiplexor to which the decoder is attached.
	* \param i_table_id Table ID, 0x4E, 0x4F, or 0x50-0x6F.	* \param i_table_id Table ID, 0x4E, 0x4F, or 0x50-0x6F.
	* \param i_extension Table ID extension, here service ID.	* \param i_extension Table ID extension, here service ID.
	* \param pf_callback function to call back on new NIT.	* \param pf_callback function to call back on new NIT.
	* \param p_cb_data private data given in argument to the callback.	* \param p_cb_data private data given in argument to the callback.
	* \return 0 if everything went ok.	* \return 0 if everything went ok.
	*/	*/

		__attribute__((deprecated))
	int dvbpsi_AttachNIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,	int dvbpsi_AttachNIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
	uint16_t i_extension, dvbpsi_nit_callback pf_callback,	uint16_t i_extension, dvbpsi_nit_callback pf_callback,
	void* p_cb_data);	void* p_cb_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DetachNIT	* dvbpsi_DetachNIT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,	* \fn void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
	uint16_t i_extension)	uint16_t i_extension)
	* \brief Destroy a NIT decoder.	* \brief Destroy a NIT decoder.
	* \param p_demux Subtable demultiplexor to which the decoder is attached.	* \param p_demux Subtable demultiplexor to which the decoder is attached.
	* \param i_table_id Table ID, 0x4E, 0x4F, or 0x50-0x6F.	* \param i_table_id Table ID, 0x4E, 0x4F, or 0x50-0x6F.
	* \param i_extension Table ID extension, here service ID.	* \param i_extension Table ID extension, here service ID.
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,	void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
	uint16_t i_extension);	uint16_t i_extension);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_InitNIT/dvbpsi_NewNIT	* dvbpsi_InitNIT/dvbpsi_NewNIT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id,	* \fn void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id,
	uint8_t i_version, int b_current_next)	uint8_t i_version, int b_current_next)
	* \brief Initialize a user-allocated dvbpsi_nit_t structure.	* \brief Initialize a user-allocated dvbpsi_nit_t structure.
	* \param p_nit pointer to the NIT structure	* \param p_nit pointer to the NIT structure
	* \param i_network_id network id	* \param i_network_id network id
	* \param i_version NIT version	* \param i_version NIT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id,	void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id,
	uint8_t i_version, int b_current_next);	uint8_t i_version, int b_current_next);

	/*!	/*!
	* \def dvbpsi_NewNIT(p_nit, i_network_id,	* \def dvbpsi_NewNIT(p_nit, i_network_id,
	i_version, b_current_next)	i_version, b_current_next)
	* \brief Allocate and initialize a new dvbpsi_nit_t structure.	* \brief Allocate and initialize a new dvbpsi_nit_t structure.
	* \param p_nit pointer to the NIT structure	* \param p_nit pointer to the NIT structure
	* \param i_network_id network id	* \param i_network_id network id
	* \param i_version NIT version	* \param i_version NIT version

	skipping to change at line 182	skipping to change at line 185

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_EmptyNIT/dvbpsi_DeleteNIT	* dvbpsi_EmptyNIT/dvbpsi_DeleteNIT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit)	* \fn void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit)
	* \brief Clean a dvbpsi_nit_t structure.	* \brief Clean a dvbpsi_nit_t structure.
	* \param p_nit pointer to the NIT structure	* \param p_nit pointer to the NIT structure
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit);	void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit);

	/*!	/*!
	* \def dvbpsi_DeleteNIT(p_nit)	* \def dvbpsi_DeleteNIT(p_nit)
	* \brief Clean and free a dvbpsi_nit_t structure.	* \brief Clean and free a dvbpsi_nit_t structure.
	* \param p_nit pointer to the NIT structure	* \param p_nit pointer to the NIT structure
	* \return nothing.	* \return nothing.
	*/	*/
	#define dvbpsi_DeleteNIT(p_nit) \	#define dvbpsi_DeleteNIT(p_nit) \
	do { \	do { \

	skipping to change at line 211	skipping to change at line 215
	uint8_t i_tag,	uint8_t i_tag,
	uint8_t i_length,	uint8_t i_length,
	uint8_t* p_data)	uint8_t* p_data)
	* \brief Add a descriptor in the NIT.	* \brief Add a descriptor in the NIT.
	* \param p_nit pointer to the NIT structure	* \param p_nit pointer to the NIT structure
	* \param i_tag descriptor's tag	* \param i_tag descriptor's tag
	* \param i_length descriptor's length	* \param i_length descriptor's length
	* \param p_data descriptor's data	* \param p_data descriptor's data
	* \return a pointer to the added descriptor.	* \return a pointer to the added descriptor.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_descriptor_t* dvbpsi_NITAddDescriptor(dvbpsi_nit_t* p_nit,	dvbpsi_descriptor_t* dvbpsi_NITAddDescriptor(dvbpsi_nit_t* p_nit,
	uint8_t i_tag, uint8_t i_lengt h,	uint8_t i_tag, uint8_t i_lengt h,
	uint8_t* p_data);	uint8_t* p_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_NITAddTS	* dvbpsi_NITAddTS
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit,	* \fn dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit,
	uint8_t i_type, uint16_t i_pid)	uint8_t i_type, uint16_t i_pid)
	* \brief Add an TS in the NIT.	* \brief Add an TS in the NIT.
	* \param p_nit pointer to the NIT structure	* \param p_nit pointer to the NIT structure
	* \param i_type type of TS	* \param i_type type of TS
	* \param i_pid PID of the TS	* \param i_pid PID of the TS
	* \return a pointer to the added TS.	* \return a pointer to the added TS.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit,	dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit,
	uint16_t i_ts_id, uint16_t i_orig_network_ id);	uint16_t i_ts_id, uint16_t i_orig_network_ id);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_NITTSAddDescriptor	* dvbpsi_NITTSAddDescriptor
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts ,	* \fn dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts ,
	uint8_t i_tag,	uint8_t i_tag,
	uint8_t i_length,	uint8_t i_length,
	uint8_t* p_data)	uint8_t* p_data)
	* \brief Add a descriptor in the NIT TS.	* \brief Add a descriptor in the NIT TS.
	* \param p_ts pointer to the TS structure	* \param p_ts pointer to the TS structure
	* \param i_tag descriptor's tag	* \param i_tag descriptor's tag
	* \param i_length descriptor's length	* \param i_length descriptor's length
	* \param p_data descriptor's data	* \param p_data descriptor's data
	* \return a pointer to the added descriptor.	* \return a pointer to the added descriptor.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts,	dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts,
	uint8_t i_tag, uint8_t i_len gth,	uint8_t i_tag, uint8_t i_len gth,
	uint8_t* p_data);	uint8_t* p_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenNITSections	* dvbpsi_GenNITSections
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_psi_section_t* dvbpsi_GenNITSections(dvbpsi_nit_t* p_nit,	* \fn dvbpsi_psi_section_t* dvbpsi_GenNITSections(dvbpsi_nit_t* p_nit,
	uint8_t i_table_id)	uint8_t i_table_id)
	* \brief NIT generator	* \brief NIT generator
	* \param p_nit NIT structure	* \param p_nit NIT structure
	* \param i_table_id table id, 0x40 = actual network / 0x41 = other network	* \param i_table_id table id, 0x40 = actual network / 0x41 = other network
	* \return a pointer to the list of generated PSI sections.	* \return a pointer to the list of generated PSI sections.
	*	*
	* Generate NIT sections based on the dvbpsi_nit_t structure.	* Generate NIT sections based on the dvbpsi_nit_t structure.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_psi_section_t* dvbpsi_GenNITSections(dvbpsi_nit_t* p_nit,	dvbpsi_psi_section_t* dvbpsi_GenNITSections(dvbpsi_nit_t* p_nit,
	uint8_t i_table_id);	uint8_t i_table_id);

	#ifdef __cplusplus	#ifdef __cplusplus
	};	};
	#endif	#endif

	#else	#else
	#error "Multiple inclusions of nit.h"	#error "Multiple inclusions of nit.h"
	#endif	#endif

End of changes. 13 change blocks.
	13 lines changed or deleted	21 lines changed or added

	pat.h	pat.h
	/************************************************************************ *	/************************************************************************ *
	* pat.h	* pat.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: pat.h 187 2009-11-18 07:26:10Z md $	* $Id$
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <pat.h>	* \file <pat.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the PAT decoder and the PAT generator.	* \brief Application interface for the PAT decoder and the PAT generator.
	*	*
	* Application interface for the PAT decoder and the PAT generator.	* Application interface for the PAT decoder and the PAT generator.
	* New decoded PAT tables are sent by callback to the application.	* New decoded PAT tables are sent by callback to the application.

	skipping to change at line 109	skipping to change at line 109
	* dvbpsi_AttachPAT	* dvbpsi_AttachPAT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_handle dvbpsi_AttachPAT(dvbpsi_pat_callback pf_callback,	* \fn dvbpsi_handle dvbpsi_AttachPAT(dvbpsi_pat_callback pf_callback,
	void* p_cb_data)	void* p_cb_data)
	* \brief Creation and initialization of a PAT decoder.	* \brief Creation and initialization of a PAT decoder.
	* \param pf_callback function to call back on new PAT	* \param pf_callback function to call back on new PAT
	* \param p_cb_data private data given in argument to the callback	* \param p_cb_data private data given in argument to the callback
	* \return a pointer to the decoder for future calls.	* \return a pointer to the decoder for future calls.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_handle dvbpsi_AttachPAT(dvbpsi_pat_callback pf_callback,	dvbpsi_handle dvbpsi_AttachPAT(dvbpsi_pat_callback pf_callback,
	void* p_cb_data);	void* p_cb_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DetachPAT	* dvbpsi_DetachPAT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_DetachPAT(dvbpsi_handle h_dvbpsi)	* \fn void dvbpsi_DetachPAT(dvbpsi_handle h_dvbpsi)
	* \brief Destroy a PAT decoder.	* \brief Destroy a PAT decoder.
	* \param h_dvbpsi handle to the decoder	* \param h_dvbpsi handle to the decoder
	* \return nothing.	* \return nothing.
	*	*
	* The handle isn't valid any more.	* The handle isn't valid any more.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_DetachPAT(dvbpsi_handle h_dvbpsi);	void dvbpsi_DetachPAT(dvbpsi_handle h_dvbpsi);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_InitPAT/dvbpsi_NewPAT	* dvbpsi_InitPAT/dvbpsi_NewPAT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_InitPAT(dvbpsi_pat_t* p_pat, uint16_t i_ts_id,	* \fn void dvbpsi_InitPAT(dvbpsi_pat_t* p_pat, uint16_t i_ts_id,
	uint8_t i_version, int b_current_next)	uint8_t i_version, int b_current_next)
	* \brief Initialize a user-allocated dvbpsi_pat_t structure.	* \brief Initialize a user-allocated dvbpsi_pat_t structure.
	* \param p_pat pointer to the PAT structure	* \param p_pat pointer to the PAT structure
	* \param i_ts_id transport stream ID	* \param i_ts_id transport stream ID
	* \param i_version PAT version	* \param i_version PAT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_InitPAT(dvbpsi_pat_t* p_pat, uint16_t i_ts_id, uint8_t i_versio n,	void dvbpsi_InitPAT(dvbpsi_pat_t* p_pat, uint16_t i_ts_id, uint8_t i_versio n,
	int b_current_next);	int b_current_next);

	/*!	/*!
	* \def dvbpsi_NewPAT(p_pat, i_ts_id, i_version, b_current_next)	* \def dvbpsi_NewPAT(p_pat, i_ts_id, i_version, b_current_next)
	* \brief Allocate and initialize a new dvbpsi_pat_t structure.	* \brief Allocate and initialize a new dvbpsi_pat_t structure.
	* \param p_pat pointer to the PAT structure	* \param p_pat pointer to the PAT structure
	* \param i_ts_id transport stream ID	* \param i_ts_id transport stream ID
	* \param i_version PAT version	* \param i_version PAT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator

	skipping to change at line 166	skipping to change at line 169

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_EmptyPAT/dvbpsi_DeletePAT	* dvbpsi_EmptyPAT/dvbpsi_DeletePAT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_EmptyPAT(dvbpsi_pat_t* p_pat)	* \fn void dvbpsi_EmptyPAT(dvbpsi_pat_t* p_pat)
	* \brief Clean a dvbpsi_pat_t structure.	* \brief Clean a dvbpsi_pat_t structure.
	* \param p_pat pointer to the PAT structure	* \param p_pat pointer to the PAT structure
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_EmptyPAT(dvbpsi_pat_t* p_pat);	void dvbpsi_EmptyPAT(dvbpsi_pat_t* p_pat);

	/*!	/*!
	* \def dvbpsi_DeletePAT(p_pat)	* \def dvbpsi_DeletePAT(p_pat)
	* \brief Clean and free a dvbpsi_pat_t structure.	* \brief Clean and free a dvbpsi_pat_t structure.
	* \param p_pat pointer to the PAT structure	* \param p_pat pointer to the PAT structure
	* \return nothing.	* \return nothing.
	*/	*/
	#define dvbpsi_DeletePAT(p_pat) \	#define dvbpsi_DeletePAT(p_pat) \
	do { \	do { \

	skipping to change at line 193	skipping to change at line 197
	/*!	/*!
	* \fn dvbpsi_pat_program_t* dvbpsi_PATAddProgram(dvbpsi_pat_t* p_pat,	* \fn dvbpsi_pat_program_t* dvbpsi_PATAddProgram(dvbpsi_pat_t* p_pat,
	uint16_t i_number,	uint16_t i_number,
	uint16_t i_pid)	uint16_t i_pid)
	* \brief Add a program at the end of the PAT.	* \brief Add a program at the end of the PAT.
	* \param p_pat pointer to the PAT structure	* \param p_pat pointer to the PAT structure
	* \param i_number program number	* \param i_number program number
	* \param i_pid PID of the NIT/PMT	* \param i_pid PID of the NIT/PMT
	* \return a pointer to the added program.	* \return a pointer to the added program.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_pat_program_t* dvbpsi_PATAddProgram(dvbpsi_pat_t* p_pat,	dvbpsi_pat_program_t* dvbpsi_PATAddProgram(dvbpsi_pat_t* p_pat,
	uint16_t i_number, uint16_t i_pi d);	uint16_t i_number, uint16_t i_pi d);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenPATSections	* dvbpsi_GenPATSections
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_psi_section_t* dvbpsi_GenPATSections(dvbpsi_pat_t* p_pat,	* \fn dvbpsi_psi_section_t* dvbpsi_GenPATSections(dvbpsi_pat_t* p_pat,
	int i_max_pps);	int i_max_pps);
	* \brief PAT generator.	* \brief PAT generator.
	* \param p_pat pointer to the PAT structure	* \param p_pat pointer to the PAT structure
	* \param i_max_pps limitation of the number of program in each section	* \param i_max_pps limitation of the number of program in each section
	* (max: 253).	* (max: 253).
	* \return a pointer to the list of generated PSI sections.	* \return a pointer to the list of generated PSI sections.
	*	*
	* Generate PAT sections based on the dvbpsi_pat_t structure.	* Generate PAT sections based on the dvbpsi_pat_t structure.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_psi_section_t* dvbpsi_GenPATSections(dvbpsi_pat_t* p_pat,	dvbpsi_psi_section_t* dvbpsi_GenPATSections(dvbpsi_pat_t* p_pat,
	int i_max_pps);	int i_max_pps);

	#ifdef __cplusplus	#ifdef __cplusplus
	};	};
	#endif	#endif

	#else	#else
	#error "Multiple inclusions of pat.h"	#error "Multiple inclusions of pat.h"
	#endif	#endif

End of changes. 11 change blocks.
	13 lines changed or deleted	19 lines changed or added

	pmt.h	pmt.h
	/************************************************************************ *	/************************************************************************ *
	* pmt.h	* pmt.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: pmt.h 187 2009-11-18 07:26:10Z md $	* $Id$
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <pmt.h>	* \file <pmt.h>
	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* \author Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* \brief Application interface for the PMT decoder and the PMT generator.	* \brief Application interface for the PMT decoder and the PMT generator.
	*	*
	* Application interface for the PMT decoder and the PMT generator.	* Application interface for the PMT decoder and the PMT generator.
	* New decoded PMT tables are sent by callback to the application.	* New decoded PMT tables are sent by callback to the application.

	skipping to change at line 117	skipping to change at line 117
	/*!	/*!
	* \fn dvbpsi_handle dvbpsi_AttachPMT(uint16_t i_program_number,	* \fn dvbpsi_handle dvbpsi_AttachPMT(uint16_t i_program_number,
	dvbpsi_pmt_callback pf_callback,	dvbpsi_pmt_callback pf_callback,
	void* p_cb_data)	void* p_cb_data)
	* \brief Creation and initialization of a PMT decoder.	* \brief Creation and initialization of a PMT decoder.
	* \param i_program_number program number	* \param i_program_number program number
	* \param pf_callback function to call back on new PMT	* \param pf_callback function to call back on new PMT
	* \param p_cb_data private data given in argument to the callback	* \param p_cb_data private data given in argument to the callback
	* \return a pointer to the decoder for future calls.	* \return a pointer to the decoder for future calls.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_handle dvbpsi_AttachPMT(uint16_t i_program_number,	dvbpsi_handle dvbpsi_AttachPMT(uint16_t i_program_number,
	dvbpsi_pmt_callback pf_callback,	dvbpsi_pmt_callback pf_callback,
	void* p_cb_data);	void* p_cb_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DetachPMT	* dvbpsi_DetachPMT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_DetachPMT(dvbpsi_handle h_dvbpsi)	* \fn void dvbpsi_DetachPMT(dvbpsi_handle h_dvbpsi)
	* \brief Destroy a PMT decoder.	* \brief Destroy a PMT decoder.
	* \param h_dvbpsi handle to the decoder	* \param h_dvbpsi handle to the decoder
	* \return nothing.	* \return nothing.
	*	*
	* The handle isn't valid any more.	* The handle isn't valid any more.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_DetachPMT(dvbpsi_handle h_dvbpsi);	void dvbpsi_DetachPMT(dvbpsi_handle h_dvbpsi);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_InitPMT/dvbpsi_NewPMT	* dvbpsi_InitPMT/dvbpsi_NewPMT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_InitPMT(dvbpsi_pmt_t* p_pmt, uint16_t i_program_number,	* \fn void dvbpsi_InitPMT(dvbpsi_pmt_t* p_pmt, uint16_t i_program_number,
	uint8_t i_version, int b_current_next,	uint8_t i_version, int b_current_next,
	uint16_t i_pcr_pid)	uint16_t i_pcr_pid)
	* \brief Initialize a user-allocated dvbpsi_pmt_t structure.	* \brief Initialize a user-allocated dvbpsi_pmt_t structure.
	* \param p_pmt pointer to the PMT structure	* \param p_pmt pointer to the PMT structure
	* \param i_program_number program number	* \param i_program_number program number
	* \param i_version PMT version	* \param i_version PMT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator
	* \param i_pcr_pid PCR_PID	* \param i_pcr_pid PCR_PID
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_InitPMT(dvbpsi_pmt_t* p_pmt, uint16_t i_program_number,	void dvbpsi_InitPMT(dvbpsi_pmt_t* p_pmt, uint16_t i_program_number,
	uint8_t i_version, int b_current_next, uint16_t i_pcr_p id);	uint8_t i_version, int b_current_next, uint16_t i_pcr_p id);

	/*!	/*!
	* \def dvbpsi_NewPMT(p_pmt, i_program_number,	* \def dvbpsi_NewPMT(p_pmt, i_program_number,
	i_version, b_current_next, i_pcr_pid)	i_version, b_current_next, i_pcr_pid)
	* \brief Allocate and initialize a new dvbpsi_pmt_t structure.	* \brief Allocate and initialize a new dvbpsi_pmt_t structure.
	* \param p_pmt pointer to the PMT structure	* \param p_pmt pointer to the PMT structure
	* \param i_program_number program number	* \param i_program_number program number
	* \param i_version PMT version	* \param i_version PMT version

	skipping to change at line 181	skipping to change at line 184

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_EmptyPMT/dvbpsi_DeletePMT	* dvbpsi_EmptyPMT/dvbpsi_DeletePMT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_EmptyPMT(dvbpsi_pmt_t* p_pmt)	* \fn void dvbpsi_EmptyPMT(dvbpsi_pmt_t* p_pmt)
	* \brief Clean a dvbpsi_pmt_t structure.	* \brief Clean a dvbpsi_pmt_t structure.
	* \param p_pmt pointer to the PMT structure	* \param p_pmt pointer to the PMT structure
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_EmptyPMT(dvbpsi_pmt_t* p_pmt);	void dvbpsi_EmptyPMT(dvbpsi_pmt_t* p_pmt);

	/*!	/*!
	* \def dvbpsi_DeletePMT(p_pmt)	* \def dvbpsi_DeletePMT(p_pmt)
	* \brief Clean and free a dvbpsi_pmt_t structure.	* \brief Clean and free a dvbpsi_pmt_t structure.
	* \param p_pmt pointer to the PMT structure	* \param p_pmt pointer to the PMT structure
	* \return nothing.	* \return nothing.
	*/	*/
	#define dvbpsi_DeletePMT(p_pmt) \	#define dvbpsi_DeletePMT(p_pmt) \
	do { \	do { \

	skipping to change at line 210	skipping to change at line 214
	uint8_t i_tag,	uint8_t i_tag,
	uint8_t i_length,	uint8_t i_length,
	uint8_t* p_data)	uint8_t* p_data)
	* \brief Add a descriptor in the PMT.	* \brief Add a descriptor in the PMT.
	* \param p_pmt pointer to the PMT structure	* \param p_pmt pointer to the PMT structure
	* \param i_tag descriptor's tag	* \param i_tag descriptor's tag
	* \param i_length descriptor's length	* \param i_length descriptor's length
	* \param p_data descriptor's data	* \param p_data descriptor's data
	* \return a pointer to the added descriptor.	* \return a pointer to the added descriptor.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_descriptor_t* dvbpsi_PMTAddDescriptor(dvbpsi_pmt_t* p_pmt,	dvbpsi_descriptor_t* dvbpsi_PMTAddDescriptor(dvbpsi_pmt_t* p_pmt,
	uint8_t i_tag, uint8_t i_lengt h,	uint8_t i_tag, uint8_t i_lengt h,
	uint8_t* p_data);	uint8_t* p_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_PMTAddES	* dvbpsi_PMTAddES
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_pmt_es_t* dvbpsi_PMTAddES(dvbpsi_pmt_t* p_pmt,	* \fn dvbpsi_pmt_es_t* dvbpsi_PMTAddES(dvbpsi_pmt_t* p_pmt,
	uint8_t i_type, uint16_t i_pid)	uint8_t i_type, uint16_t i_pid)
	* \brief Add an ES in the PMT.	* \brief Add an ES in the PMT.
	* \param p_pmt pointer to the PMT structure	* \param p_pmt pointer to the PMT structure
	* \param i_type type of ES	* \param i_type type of ES
	* \param i_pid PID of the ES	* \param i_pid PID of the ES
	* \return a pointer to the added ES.	* \return a pointer to the added ES.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_pmt_es_t* dvbpsi_PMTAddES(dvbpsi_pmt_t* p_pmt,	dvbpsi_pmt_es_t* dvbpsi_PMTAddES(dvbpsi_pmt_t* p_pmt,
	uint8_t i_type, uint16_t i_pid);	uint8_t i_type, uint16_t i_pid);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_PMTESAddDescriptor	* dvbpsi_PMTESAddDescriptor
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_descriptor_t* dvbpsi_PMTESAddDescriptor(dvbpsi_pmt_es_t* p_es ,	* \fn dvbpsi_descriptor_t* dvbpsi_PMTESAddDescriptor(dvbpsi_pmt_es_t* p_es ,
	uint8_t i_tag,	uint8_t i_tag,
	uint8_t i_length,	uint8_t i_length,
	uint8_t* p_data)	uint8_t* p_data)
	* \brief Add a descriptor in the PMT ES.	* \brief Add a descriptor in the PMT ES.
	* \param p_es pointer to the ES structure	* \param p_es pointer to the ES structure
	* \param i_tag descriptor's tag	* \param i_tag descriptor's tag
	* \param i_length descriptor's length	* \param i_length descriptor's length
	* \param p_data descriptor's data	* \param p_data descriptor's data
	* \return a pointer to the added descriptor.	* \return a pointer to the added descriptor.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_descriptor_t* dvbpsi_PMTESAddDescriptor(dvbpsi_pmt_es_t* p_es,	dvbpsi_descriptor_t* dvbpsi_PMTESAddDescriptor(dvbpsi_pmt_es_t* p_es,
	uint8_t i_tag, uint8_t i_len gth,	uint8_t i_tag, uint8_t i_len gth,
	uint8_t* p_data);	uint8_t* p_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenPMTSections	* dvbpsi_GenPMTSections
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_psi_section_t* dvbpsi_GenPMTSections(dvbpsi_pmt_t* p_pmt)	* \fn dvbpsi_psi_section_t* dvbpsi_GenPMTSections(dvbpsi_pmt_t* p_pmt)
	* \brief PMT generator	* \brief PMT generator
	* \param p_pmt PMT structure	* \param p_pmt PMT structure
	* \return a pointer to the list of generated PSI sections.	* \return a pointer to the list of generated PSI sections.
	*	*
	* Generate PMT sections based on the dvbpsi_pmt_t structure.	* Generate PMT sections based on the dvbpsi_pmt_t structure.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_psi_section_t* dvbpsi_GenPMTSections(dvbpsi_pmt_t* p_pmt);	dvbpsi_psi_section_t* dvbpsi_GenPMTSections(dvbpsi_pmt_t* p_pmt);

	#ifdef __cplusplus	#ifdef __cplusplus
	};	};
	#endif	#endif

	#else	#else
	#error "Multiple inclusions of pmt.h"	#error "Multiple inclusions of pmt.h"
	#endif	#endif

End of changes. 13 change blocks.
	13 lines changed or deleted	21 lines changed or added

	sdt.h	sdt.h
	/************************************************************************ *	/************************************************************************ *
	* sdt.h	* sdt.h

	* (c)2001-2002 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: sdt.h 187 2009-11-18 07:26:10Z md $	* $Id$
	*	*
	* Authors: Johan Bilien <jobi@via.ecp.fr>	* Authors: Johan Bilien <jobi@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <sdt.h>	* \file <sdt.h>
	* \author Johan Bilien <jobi@via.ecp.fr>	* \author Johan Bilien <jobi@via.ecp.fr>
	* \brief Application interface for the SDT decoder and the SDT generator.	* \brief Application interface for the SDT decoder and the SDT generator.
	*	*
	* Application interface for the SDT decoder and the SDT generator.	* Application interface for the SDT decoder and the SDT generator.
	* New decoded SDT tables are sent by callback to the application.	* New decoded SDT tables are sent by callback to the application.

	skipping to change at line 123	skipping to change at line 123
	uint16_t i_extension, dvbpsi_sdt_callback pf_callback,	uint16_t i_extension, dvbpsi_sdt_callback pf_callback,
	void* p_cb_data)	void* p_cb_data)
	* \brief Creation and initialization of a SDT decoder.	* \brief Creation and initialization of a SDT decoder.
	* \param p_demux Subtable demultiplexor to which the decoder is attached.	* \param p_demux Subtable demultiplexor to which the decoder is attached.
	* \param i_table_id Table ID, 0x42 or 0x46.	* \param i_table_id Table ID, 0x42 or 0x46.
	* \param i_extension Table ID extension, here TS ID.	* \param i_extension Table ID extension, here TS ID.
	* \param pf_callback function to call back on new SDT.	* \param pf_callback function to call back on new SDT.
	* \param p_cb_data private data given in argument to the callback.	* \param p_cb_data private data given in argument to the callback.
	* \return 0 if everything went ok.	* \return 0 if everything went ok.
	*/	*/

		__attribute__((deprecated))
	int dvbpsi_AttachSDT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,	int dvbpsi_AttachSDT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
	uint16_t i_extension, dvbpsi_sdt_callback pf_callback,	uint16_t i_extension, dvbpsi_sdt_callback pf_callback,
	void* p_cb_data);	void* p_cb_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DetachSDT	* dvbpsi_DetachSDT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,	* \fn void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
	uint16_t i_extension)	uint16_t i_extension)
	* \brief Destroy a SDT decoder.	* \brief Destroy a SDT decoder.
	* \param p_demux Subtable demultiplexor to which the decoder is attached.	* \param p_demux Subtable demultiplexor to which the decoder is attached.
	* \param i_table_id Table ID, 0x42 or 0x46.	* \param i_table_id Table ID, 0x42 or 0x46.
	* \param i_extension Table ID extension, here TS ID.	* \param i_extension Table ID extension, here TS ID.
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,	void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
	uint16_t i_extension);	uint16_t i_extension);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_InitSDT/dvbpsi_NewSDT	* dvbpsi_InitSDT/dvbpsi_NewSDT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_InitSDT(dvbpsi_sdt_t* p_sdt, uint16_t i_ts_id,	* \fn void dvbpsi_InitSDT(dvbpsi_sdt_t* p_sdt, uint16_t i_ts_id,
	uint8_t i_version, int b_current_next, uint16_t i_network_id)	uint8_t i_version, int b_current_next, uint16_t i_network_id)
	* \brief Initialize a user-allocated dvbpsi_sdt_t structure.	* \brief Initialize a user-allocated dvbpsi_sdt_t structure.
	* \param p_sdt pointer to the SDT structure	* \param p_sdt pointer to the SDT structure
	* \param i_ts_id transport stream ID	* \param i_ts_id transport stream ID
	* \param i_version SDT version	* \param i_version SDT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator
	* \param i_network_id original network id	* \param i_network_id original network id
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_InitSDT(dvbpsi_sdt_t *p_sdt, uint16_t i_ts_id, uint8_t i_versio n,	void dvbpsi_InitSDT(dvbpsi_sdt_t *p_sdt, uint16_t i_ts_id, uint8_t i_versio n,
	int b_current_next, uint16_t i_network_id);	int b_current_next, uint16_t i_network_id);

	/*!	/*!
	* \def dvbpsi_NewSDT(p_sdt, i_ts_id, i_version, b_current_next, i_network_ id)	* \def dvbpsi_NewSDT(p_sdt, i_ts_id, i_version, b_current_next, i_network_ id)
	* \brief Allocate and initialize a new dvbpsi_sdt_t structure.	* \brief Allocate and initialize a new dvbpsi_sdt_t structure.
	* \param p_sdt pointer to the SDT structure	* \param p_sdt pointer to the SDT structure
	* \param i_ts_id transport stream ID	* \param i_ts_id transport stream ID
	* \param i_version SDT version	* \param i_version SDT version
	* \param b_current_next current next indicator	* \param b_current_next current next indicator

	skipping to change at line 185	skipping to change at line 188

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_EmptySDT/dvbpsi_DeleteSDT	* dvbpsi_EmptySDT/dvbpsi_DeleteSDT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_EmptySDT(dvbpsi_sdt_t* p_sdt)	* \fn void dvbpsi_EmptySDT(dvbpsi_sdt_t* p_sdt)
	* \brief Clean a dvbpsi_sdt_t structure.	* \brief Clean a dvbpsi_sdt_t structure.
	* \param p_sdt pointer to the SDT structure	* \param p_sdt pointer to the SDT structure
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_EmptySDT(dvbpsi_sdt_t *p_sdt);	void dvbpsi_EmptySDT(dvbpsi_sdt_t *p_sdt);

	/*!	/*!
	* \def dvbpsi_DeleteSDT(p_sdt)	* \def dvbpsi_DeleteSDT(p_sdt)
	* \brief Clean and free a dvbpsi_sdt_t structure.	* \brief Clean and free a dvbpsi_sdt_t structure.
	* \param p_sdt pointer to the SDT structure	* \param p_sdt pointer to the SDT structure
	* \return nothing.	* \return nothing.
	*/	*/
	#define dvbpsi_DeleteSDT(p_sdt) \	#define dvbpsi_DeleteSDT(p_sdt) \
	do { \	do { \

	skipping to change at line 218	skipping to change at line 222
	int b_free_ca)	int b_free_ca)
	* \brief Add a service description at the end of the SDT.	* \brief Add a service description at the end of the SDT.
	* \param p_sdt pointer to the SDT structure	* \param p_sdt pointer to the SDT structure
	* \param i_service_id Service ID	* \param i_service_id Service ID
	* \param b_eit_schedule EIT Schedule flag	* \param b_eit_schedule EIT Schedule flag
	* \param b_eit_present EIT Present/Following flag	* \param b_eit_present EIT Present/Following flag
	* \param i_running_status Running status	* \param i_running_status Running status
	* \param b_free_ca Free CA flag	* \param b_free_ca Free CA flag
	* \return a pointer to the added service description.	* \return a pointer to the added service description.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_sdt_service_t dvbpsi_SDTAddService(dvbpsi_sdt_t p_sdt,	dvbpsi_sdt_service_t dvbpsi_SDTAddService(dvbpsi_sdt_t p_sdt,
	uint16_t i_service_id, int b_eit_schedule, int b_eit_present,	uint16_t i_service_id, int b_eit_schedule, int b_eit_present,
	uint8_t i_running_status,int b_free_ca);	uint8_t i_running_status,int b_free_ca);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_SDTServiceAddDescriptor	* dvbpsi_SDTServiceAddDescriptor
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(	* \fn dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(
	dvbpsi_sdt_service_t *p_serv ice,	dvbpsi_sdt_service_t *p_serv ice,
	uint8_t i_tag, uint8_t i_len gth,	uint8_t i_tag, uint8_t i_len gth,
	uint8_t *p_data)	uint8_t *p_data)
	* \brief Add a descriptor in the SDT service.	* \brief Add a descriptor in the SDT service.
	* \param p_service pointer to the service structure	* \param p_service pointer to the service structure
	* \param i_tag descriptor's tag	* \param i_tag descriptor's tag
	* \param i_length descriptor's length	* \param i_length descriptor's length
	* \param p_data descriptor's data	* \param p_data descriptor's data
	* \return a pointer to the added descriptor.	* \return a pointer to the added descriptor.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(	dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(
	dvbpsi_sdt_service_t *p_serv ice,	dvbpsi_sdt_service_t *p_serv ice,
	uint8_t i_tag, uint8_t i_len gth,	uint8_t i_tag, uint8_t i_len gth,
	uint8_t *p_data);	uint8_t *p_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenSDTSections	* dvbpsi_GenSDTSections
	************************************************************************ *	************************************************************************ *
	* Generate SDT sections based on the dvbpsi_sdt_t structure.	* Generate SDT sections based on the dvbpsi_sdt_t structure.
	************************************************************************ */	************************************************************************ */

End of changes. 11 change blocks.
	13 lines changed or deleted	19 lines changed or added

	tot.h	tot.h
	/************************************************************************ *	/************************************************************************ *
	* tot.h	* tot.h

	* (c)2001-2008 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: tot.h 187 2009-11-18 07:26:10Z md $	* $Id$
	*	*
	* Authors: Johann Hanne	* Authors: Johann Hanne
	* heavily based on pmt.c which was written by	* heavily based on pmt.c which was written by
	* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*

	* This program is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License	* modify it under the terms of the GNU Lesser General Public
	* as published by the Free Software Foundation; either version 2	* License as published by the Free Software Foundation; either
	* of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	* This program is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of

	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* GNU General Public License for more details.	* Lesser General Public License for more details.
	*	*

	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Lesser General Public
	* along with this program; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130
	SA.	1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	/*!	/*!
	* \file <tot.h>	* \file <tot.h>
	* \author Johann Hanne	* \author Johann Hanne
	* \brief Application interface for the TDT/TOT decoder and the TDT/TOT gen erator.	* \brief Application interface for the TDT/TOT decoder and the TDT/TOT gen erator.
	*	*
	* Application interface for the TDT/TOT decoder and the TDT/TOT generator.	* Application interface for the TDT/TOT decoder and the TDT/TOT generator.
	* New decoded TDT/TOT tables are sent by callback to the application.	* New decoded TDT/TOT tables are sent by callback to the application.

	skipping to change at line 90	skipping to change at line 90
	* \fn int dvbpsi_AttachTOT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,	* \fn int dvbpsi_AttachTOT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
	dvbpsi_tot_callback pf_callback, void* p_cb_dat a)	dvbpsi_tot_callback pf_callback, void* p_cb_dat a)
	* \brief Creation and initialization of a TDT/TOT decoder.	* \brief Creation and initialization of a TDT/TOT decoder.
	* \param p_demux Subtable demultiplexor to which the decoder is attached.	* \param p_demux Subtable demultiplexor to which the decoder is attached.
	* \param i_table_id Table ID, usually 0x70	* \param i_table_id Table ID, usually 0x70
	* \param i_extension Table ID extension, unused in the TDT/TOT	* \param i_extension Table ID extension, unused in the TDT/TOT
	* \param pf_callback function to call back on new TDT/TOT.	* \param pf_callback function to call back on new TDT/TOT.
	* \param p_cb_data private data given in argument to the callback.	* \param p_cb_data private data given in argument to the callback.
	* \return 0 if everything went ok.	* \return 0 if everything went ok.
	*/	*/

		__attribute__((deprecated))
	int dvbpsi_AttachTOT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,	int dvbpsi_AttachTOT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
	uint16_t i_extension,	uint16_t i_extension,
	dvbpsi_tot_callback pf_callback, void* p_cb_data);	dvbpsi_tot_callback pf_callback, void* p_cb_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DetachTOT	* dvbpsi_DetachTOT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn int dvbpsi_DetachTOT(dvbpsi_demux_t * p_demux, uint8_t i_table_id)	* \fn int dvbpsi_DetachTOT(dvbpsi_demux_t * p_demux, uint8_t i_table_id)
	* \brief Destroy a TDT/TOT decoder.	* \brief Destroy a TDT/TOT decoder.
	* \param p_demux Subtable demultiplexor to which the decoder is attached.	* \param p_demux Subtable demultiplexor to which the decoder is attached.
	* \param i_table_id Table ID, usually 0x70	* \param i_table_id Table ID, usually 0x70
	* \param i_extension Table ID extension, unused in the TDT/TOT	* \param i_extension Table ID extension, unused in the TDT/TOT
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_DetachTOT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,	void dvbpsi_DetachTOT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
	uint16_t i_extension);	uint16_t i_extension);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_InitTOT/dvbpsi_NewTOT	* dvbpsi_InitTOT/dvbpsi_NewTOT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_InitTOT(dvbpsi_tot_t* p_tot)	* \fn void dvbpsi_InitTOT(dvbpsi_tot_t* p_tot)
	* \brief Initialize a user-allocated dvbpsi_tot_t structure.	* \brief Initialize a user-allocated dvbpsi_tot_t structure.
	* \param p_tot pointer to the TDT/TOT structure	* \param p_tot pointer to the TDT/TOT structure
	* \param i_utc_time the time in UTC	* \param i_utc_time the time in UTC
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_InitTOT(dvbpsi_tot_t* p_tot, uint64_t i_utc_time);	void dvbpsi_InitTOT(dvbpsi_tot_t* p_tot, uint64_t i_utc_time);

	/*!	/*!
	* \def dvbpsi_NewTOT(p_tot)	* \def dvbpsi_NewTOT(p_tot)
	* \brief Allocate and initialize a new dvbpsi_tot_t structure.	* \brief Allocate and initialize a new dvbpsi_tot_t structure.
	* \param p_tot pointer to the TDT/TOT structure	* \param p_tot pointer to the TDT/TOT structure
	* \param i_utc_time the time in UTC	* \param i_utc_time the time in UTC
	* \return nothing.	* \return nothing.
	*/	*/
	#define dvbpsi_NewTOT(p_tot, i_utc_time) \	#define dvbpsi_NewTOT(p_tot, i_utc_time) \

	skipping to change at line 143	skipping to change at line 146

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_EmptyTOT/dvbpsi_DeleteTOT	* dvbpsi_EmptyTOT/dvbpsi_DeleteTOT
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn void dvbpsi_EmptyTOT(dvbpsi_tot_t* p_tot)	* \fn void dvbpsi_EmptyTOT(dvbpsi_tot_t* p_tot)
	* \brief Clean a dvbpsi_tot_t structure.	* \brief Clean a dvbpsi_tot_t structure.
	* \param p_tot pointer to the TDT/TOT structure	* \param p_tot pointer to the TDT/TOT structure
	* \return nothing.	* \return nothing.
	*/	*/

		__attribute__((deprecated))
	void dvbpsi_EmptyTOT(dvbpsi_tot_t* p_tot);	void dvbpsi_EmptyTOT(dvbpsi_tot_t* p_tot);

	/*!	/*!
	* \def dvbpsi_DeleteTOT(p_tot)	* \def dvbpsi_DeleteTOT(p_tot)
	* \brief Clean and free a dvbpsi_tot_t structure.	* \brief Clean and free a dvbpsi_tot_t structure.
	* \param p_tot pointer to the TDT/TOT structure	* \param p_tot pointer to the TDT/TOT structure
	* \return nothing.	* \return nothing.
	*/	*/
	#define dvbpsi_DeleteTOT(p_tot) \	#define dvbpsi_DeleteTOT(p_tot) \
	do { \	do { \

	skipping to change at line 172	skipping to change at line 176
	uint8_t i_tag,	uint8_t i_tag,
	uint8_t i_length,	uint8_t i_length,
	uint8_t* p_data)	uint8_t* p_data)
	* \brief Add a descriptor in the TOT.	* \brief Add a descriptor in the TOT.
	* \param p_tot pointer to the TOT structure	* \param p_tot pointer to the TOT structure
	* \param i_tag descriptor's tag	* \param i_tag descriptor's tag
	* \param i_length descriptor's length	* \param i_length descriptor's length
	* \param p_data descriptor's data	* \param p_data descriptor's data
	* \return a pointer to the added descriptor.	* \return a pointer to the added descriptor.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_descriptor_t* dvbpsi_TOTAddDescriptor(dvbpsi_tot_t* p_tot,	dvbpsi_descriptor_t* dvbpsi_TOTAddDescriptor(dvbpsi_tot_t* p_tot,
	uint8_t i_tag, uint8_t i_lengt h,	uint8_t i_tag, uint8_t i_lengt h,
	uint8_t* p_data);	uint8_t* p_data);

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenTOTSections	* dvbpsi_GenTOTSections
	************************************************************************ */	************************************************************************ */
	/*!	/*!
	* \fn dvbpsi_psi_section_t* dvbpsi_GenTOTSections(dvbpsi_Ttot_t* p_tot)	* \fn dvbpsi_psi_section_t* dvbpsi_GenTOTSections(dvbpsi_Ttot_t* p_tot)
	* \brief TDT/TOT generator	* \brief TDT/TOT generator
	* \param p_tot TDT/TOT structure	* \param p_tot TDT/TOT structure
	* \return a pointer to the list of generated PSI sections.	* \return a pointer to the list of generated PSI sections.
	*	*
	* Generate TDT/TOT sections based on the dvbpsi_tot_t structure.	* Generate TDT/TOT sections based on the dvbpsi_tot_t structure.
	*/	*/

		__attribute__((deprecated))
	dvbpsi_psi_section_t* dvbpsi_GenTOTSections(dvbpsi_tot_t* p_tot);	dvbpsi_psi_section_t* dvbpsi_GenTOTSections(dvbpsi_tot_t* p_tot);

	#ifdef __cplusplus	#ifdef __cplusplus
	};	};
	#endif	#endif

	#else	#else
	#error "Multiple inclusions of tot.h"	#error "Multiple inclusions of tot.h"
	#endif	#endif

End of changes. 11 change blocks.
	13 lines changed or deleted	19 lines changed or added