[SCM] faad2 packaging branch, master, updated. upstream/2.7-34-g94259e5

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Mon Jun 1 01:05:51 UTC 2009


The following commit has been merged in the master branch:
commit 1283c9cf3674c54d9be99c8764ea649c98cf1a63
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 31 20:29:53 2009 -0400

    Revert "Add in DRM (Digital Radio Mondiale) support."
    
    This reverts commit c0a243280b153b31e68705f1f786afa63ae9fd6a.

diff --git a/debian/faad.debhelper.log b/debian/faad.debhelper.log
deleted file mode 100644
index 1c05317..0000000
--- a/debian/faad.debhelper.log
+++ /dev/null
@@ -1,49 +0,0 @@
-dh_quilt_patch
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installcatalogs
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_bugfiles
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_pysupport
-dh_scrollkeeper
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
diff --git a/debian/faad.substvars b/debian/faad.substvars
deleted file mode 100644
index 00bceaa..0000000
--- a/debian/faad.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-shlibs:Depends=libc6 (>= 2.1), libfaad2, libmp4ff0
-misc:Depends=
diff --git a/debian/faad/DEBIAN/control b/debian/faad/DEBIAN/control
deleted file mode 100644
index 7162091..0000000
--- a/debian/faad/DEBIAN/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Package: faad
-Source: faad2
-Version: 2.7-1
-Architecture: i386
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Installed-Size: 80
-Depends: libc6 (>= 2.1), libfaad2, libmp4ff0
-Conflicts: faad2
-Replaces: faad2
-Section: sound
-Priority: optional
-Homepage: http://www.audiocoding.com/
-Description: freeware Advanced Audio Decoder player
- FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly
- decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC
- files.
- .
- This package contains a command line interface to play AAC or MP4 files.
diff --git a/debian/faad/DEBIAN/md5sums b/debian/faad/DEBIAN/md5sums
deleted file mode 100644
index 54d9cf2..0000000
--- a/debian/faad/DEBIAN/md5sums
+++ /dev/null
@@ -1,5 +0,0 @@
-fafe3cb8c26f81c883e0411572d65748  usr/bin/faad
-c1565d330e5c27d449685efc155ad6f7  usr/share/man/man1/faad.1.gz
-872727187898d91451a1da70d011c431  usr/share/doc/faad/copyright
-d48a457b787d2e426113fad3ea1fd3f3  usr/share/doc/faad/changelog.Debian.gz
-ea420291ba0f031bfa5722bc8abae1c8  usr/share/doc/faad/changelog.gz
diff --git a/debian/faad/usr/bin/faad b/debian/faad/usr/bin/faad
deleted file mode 100755
index 0ce82a1..0000000
Binary files a/debian/faad/usr/bin/faad and /dev/null differ
diff --git a/debian/faad/usr/share/doc/faad/changelog.Debian.gz b/debian/faad/usr/share/doc/faad/changelog.Debian.gz
deleted file mode 100644
index 858404f..0000000
Binary files a/debian/faad/usr/share/doc/faad/changelog.Debian.gz and /dev/null differ
diff --git a/debian/faad/usr/share/doc/faad/changelog.gz b/debian/faad/usr/share/doc/faad/changelog.gz
deleted file mode 100644
index 0e11c56..0000000
Binary files a/debian/faad/usr/share/doc/faad/changelog.gz and /dev/null differ
diff --git a/debian/faad/usr/share/doc/faad/copyright b/debian/faad/usr/share/doc/faad/copyright
deleted file mode 100644
index 78e16be..0000000
--- a/debian/faad/usr/share/doc/faad/copyright
+++ /dev/null
@@ -1,75 +0,0 @@
-This package was debianized by Aubin Paul on Sun, 8 Dec 2002 12:05:10 -0500.
-This package was prepared for inclusion in Debian by Matthew W. S. Bell 
-<matthew at bells23.org.uk> in May 2006 
-
-It was downloaded from http://faac.sourceforge.net/index.php.
-Official website is now at http://www.audiocoding.com/
-CVS is still hosted by SourceForge.net
-
-Debian Authors:   Matthew W. S. Bell	<matthew at bells23.org.uk>
-                  Aubin Paul		<aubin at outlyer.org>
-Copyright:        2006, 2007, 2008	Matthew W. S. Bell
-                  200			Aubin Paul
-
-Upstream Authors: menno			<menno at audiocoding.com>
-		  Alexander Kurpiers	<a.kurpiers at nt.tu-darmstadt.de>
- 		  M. Bakker		<mbakker at nero.com>
-		  Ahead Software AG
-		  Nero AG
-Copyright:	  2002-2005		M. Bakker
-		  2003-2005		Ahead Software AG
-		  2003-2005		Nero AG
-
-Other Authors:	  John Edwards
-		  Bill May		<wmay at cisco.com>
-		  Quinnware
-		  VideoLAN
-Copyright:	  2002			John Edwards
-		  2003			Bill May
-		  1997-2002		Quinnware
-		  2004			VideoLAN
-
-License Declaration:
-
-The GPL may be found in the file /usr/share/common-licenses/GPL.
-
-The upstream source has the follwing license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden.
-
-The "appropriate copyright message" mentioned in section 2c of the GPLv2 must
-read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
----
-
-The aacDECdrop module has the following license declaration:
----
-This program is distributed under the GNU General Public License, version 2. A
-copy of this license is included with this source.
----
-
-Some files (extra components and plugins) and the Debian packaging have the
-following license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
----
diff --git a/debian/faad/usr/share/man/man1/faad.1.gz b/debian/faad/usr/share/man/man1/faad.1.gz
deleted file mode 100644
index fed4da7..0000000
Binary files a/debian/faad/usr/share/man/man1/faad.1.gz and /dev/null differ
diff --git a/debian/faad2-dbg.debhelper.log b/debian/faad2-dbg.debhelper.log
deleted file mode 100644
index 1c05317..0000000
--- a/debian/faad2-dbg.debhelper.log
+++ /dev/null
@@ -1,49 +0,0 @@
-dh_quilt_patch
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installcatalogs
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_bugfiles
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_pysupport
-dh_scrollkeeper
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
diff --git a/debian/faad2-dbg.substvars b/debian/faad2-dbg.substvars
deleted file mode 100644
index abd3ebe..0000000
--- a/debian/faad2-dbg.substvars
+++ /dev/null
@@ -1 +0,0 @@
-misc:Depends=
diff --git a/debian/faad2-dbg/DEBIAN/control b/debian/faad2-dbg/DEBIAN/control
deleted file mode 100644
index e2aeca8..0000000
--- a/debian/faad2-dbg/DEBIAN/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Package: faad2-dbg
-Source: faad2
-Version: 2.7-1
-Architecture: i386
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Installed-Size: 548
-Depends: libfaad2 (= 2.7-1), faad (= 2.7-1)
-Section: debug
-Priority: extra
-Homepage: http://www.audiocoding.com/
-Description: freeware Advanced Audio Decoder - debugging symbols
- FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly
- decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC
- files.
- .
- This package contains the debugging symbols for all binary packages.
diff --git a/debian/faad2-dbg/DEBIAN/md5sums b/debian/faad2-dbg/DEBIAN/md5sums
deleted file mode 100644
index dff6e15..0000000
--- a/debian/faad2-dbg/DEBIAN/md5sums
+++ /dev/null
@@ -1,6 +0,0 @@
-872727187898d91451a1da70d011c431  usr/share/doc/faad2-dbg/copyright
-d48a457b787d2e426113fad3ea1fd3f3  usr/share/doc/faad2-dbg/changelog.Debian.gz
-ea420291ba0f031bfa5722bc8abae1c8  usr/share/doc/faad2-dbg/changelog.gz
-92f1c17a6306a32cae94bc4400a6aeca  usr/lib/debug/usr/bin/faad
-60626c599a6978b67ccce0607ad8548f  usr/lib/debug/usr/lib/libmp4ff.so.0.0.0
-40b20a87dae7d19a9ec15ab4fd5d1591  usr/lib/debug/usr/lib/libfaad.so.2.0.0
diff --git a/debian/faad2-dbg/usr/lib/debug/usr/bin/faad b/debian/faad2-dbg/usr/lib/debug/usr/bin/faad
deleted file mode 100644
index ab5d216..0000000
Binary files a/debian/faad2-dbg/usr/lib/debug/usr/bin/faad and /dev/null differ
diff --git a/debian/faad2-dbg/usr/lib/debug/usr/lib/libfaad.so.2.0.0 b/debian/faad2-dbg/usr/lib/debug/usr/lib/libfaad.so.2.0.0
deleted file mode 100644
index 98a0ae0..0000000
Binary files a/debian/faad2-dbg/usr/lib/debug/usr/lib/libfaad.so.2.0.0 and /dev/null differ
diff --git a/debian/faad2-dbg/usr/lib/debug/usr/lib/libmp4ff.so.0.0.0 b/debian/faad2-dbg/usr/lib/debug/usr/lib/libmp4ff.so.0.0.0
deleted file mode 100644
index bd23acc..0000000
Binary files a/debian/faad2-dbg/usr/lib/debug/usr/lib/libmp4ff.so.0.0.0 and /dev/null differ
diff --git a/debian/faad2-dbg/usr/share/doc/faad2-dbg/changelog.Debian.gz b/debian/faad2-dbg/usr/share/doc/faad2-dbg/changelog.Debian.gz
deleted file mode 100644
index 858404f..0000000
Binary files a/debian/faad2-dbg/usr/share/doc/faad2-dbg/changelog.Debian.gz and /dev/null differ
diff --git a/debian/faad2-dbg/usr/share/doc/faad2-dbg/changelog.gz b/debian/faad2-dbg/usr/share/doc/faad2-dbg/changelog.gz
deleted file mode 100644
index 0e11c56..0000000
Binary files a/debian/faad2-dbg/usr/share/doc/faad2-dbg/changelog.gz and /dev/null differ
diff --git a/debian/faad2-dbg/usr/share/doc/faad2-dbg/copyright b/debian/faad2-dbg/usr/share/doc/faad2-dbg/copyright
deleted file mode 100644
index 78e16be..0000000
--- a/debian/faad2-dbg/usr/share/doc/faad2-dbg/copyright
+++ /dev/null
@@ -1,75 +0,0 @@
-This package was debianized by Aubin Paul on Sun, 8 Dec 2002 12:05:10 -0500.
-This package was prepared for inclusion in Debian by Matthew W. S. Bell 
-<matthew at bells23.org.uk> in May 2006 
-
-It was downloaded from http://faac.sourceforge.net/index.php.
-Official website is now at http://www.audiocoding.com/
-CVS is still hosted by SourceForge.net
-
-Debian Authors:   Matthew W. S. Bell	<matthew at bells23.org.uk>
-                  Aubin Paul		<aubin at outlyer.org>
-Copyright:        2006, 2007, 2008	Matthew W. S. Bell
-                  200			Aubin Paul
-
-Upstream Authors: menno			<menno at audiocoding.com>
-		  Alexander Kurpiers	<a.kurpiers at nt.tu-darmstadt.de>
- 		  M. Bakker		<mbakker at nero.com>
-		  Ahead Software AG
-		  Nero AG
-Copyright:	  2002-2005		M. Bakker
-		  2003-2005		Ahead Software AG
-		  2003-2005		Nero AG
-
-Other Authors:	  John Edwards
-		  Bill May		<wmay at cisco.com>
-		  Quinnware
-		  VideoLAN
-Copyright:	  2002			John Edwards
-		  2003			Bill May
-		  1997-2002		Quinnware
-		  2004			VideoLAN
-
-License Declaration:
-
-The GPL may be found in the file /usr/share/common-licenses/GPL.
-
-The upstream source has the follwing license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden.
-
-The "appropriate copyright message" mentioned in section 2c of the GPLv2 must
-read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
----
-
-The aacDECdrop module has the following license declaration:
----
-This program is distributed under the GNU General Public License, version 2. A
-copy of this license is included with this source.
----
-
-Some files (extra components and plugins) and the Debian packaging have the
-following license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
----
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 8b2797e..0000000
--- a/debian/files
+++ /dev/null
@@ -1,6 +0,0 @@
-libfaad-dev_2.7-1_i386.deb libdevel optional
-libmp4ff-dev_2.7-1_i386.deb libdevel optional
-libfaad2_2.7-1_i386.deb libs optional
-libmp4ff0_2.7-1_i386.deb libs optional
-faad2-dbg_2.7-1_i386.deb debug extra
-faad_2.7-1_i386.deb sound optional
diff --git a/debian/libfaad-dev.debhelper.log b/debian/libfaad-dev.debhelper.log
deleted file mode 100644
index 1c05317..0000000
--- a/debian/libfaad-dev.debhelper.log
+++ /dev/null
@@ -1,49 +0,0 @@
-dh_quilt_patch
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installcatalogs
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_bugfiles
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_pysupport
-dh_scrollkeeper
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
diff --git a/debian/libfaad-dev.substvars b/debian/libfaad-dev.substvars
deleted file mode 100644
index abd3ebe..0000000
--- a/debian/libfaad-dev.substvars
+++ /dev/null
@@ -1 +0,0 @@
-misc:Depends=
diff --git a/debian/libfaad-dev/DEBIAN/control b/debian/libfaad-dev/DEBIAN/control
deleted file mode 100644
index b328a74..0000000
--- a/debian/libfaad-dev/DEBIAN/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Package: libfaad-dev
-Source: faad2
-Version: 2.7-1
-Architecture: i386
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Installed-Size: 368
-Depends: libfaad2 (= 2.7-1)
-Conflicts: libfaad2-dev
-Replaces: libfaad2-dev
-Section: libdevel
-Priority: optional
-Homepage: http://www.audiocoding.com/
-Description: freeware Advanced Audio Decoder - development files
- FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly
- decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC
- files.
- .
- This package contains development files.
diff --git a/debian/libfaad-dev/DEBIAN/md5sums b/debian/libfaad-dev/DEBIAN/md5sums
deleted file mode 100644
index ea13ca5..0000000
--- a/debian/libfaad-dev/DEBIAN/md5sums
+++ /dev/null
@@ -1,7 +0,0 @@
-872727187898d91451a1da70d011c431  usr/share/doc/libfaad-dev/copyright
-d48a457b787d2e426113fad3ea1fd3f3  usr/share/doc/libfaad-dev/changelog.Debian.gz
-ea420291ba0f031bfa5722bc8abae1c8  usr/share/doc/libfaad-dev/changelog.gz
-c2ee78243595dd5b8f5e8be655b704e8  usr/lib/libfaad.la
-4b7c8d90d9c0baed077532a02d3cb3b3  usr/lib/libfaad.a
-a59a5854713114c00e8ba630ddecce93  usr/include/faad.h
-724c99b029c2589c4b837a47355130a0  usr/include/neaacdec.h
diff --git a/debian/libfaad-dev/usr/include/faad.h b/debian/libfaad-dev/usr/include/faad.h
deleted file mode 100644
index 72f4072..0000000
--- a/debian/libfaad-dev/usr/include/faad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-** $Id: faad.h,v 1.51 2007/11/01 12:33:29 menno Exp $
-**/
-
-/* warn people for update */
-#pragma message("please update faad2 include filename and function names!")
-
-/* Backwards compatible link */
-#include "neaacdec.h"
diff --git a/debian/libfaad-dev/usr/include/neaacdec.h b/debian/libfaad-dev/usr/include/neaacdec.h
deleted file mode 100644
index a45f1d0..0000000
--- a/debian/libfaad-dev/usr/include/neaacdec.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-** $Id: neaacdec.h,v 1.13 2009/01/26 23:51:15 menno Exp $
-**/
-
-#ifndef __NEAACDEC_H__
-#define __NEAACDEC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#if 1
-/* MACROS FOR BACKWARDS COMPATIBILITY */
-/* structs */
-#define faacDecHandle                  NeAACDecHandle
-#define faacDecConfiguration           NeAACDecConfiguration
-#define faacDecConfigurationPtr        NeAACDecConfigurationPtr
-#define faacDecFrameInfo               NeAACDecFrameInfo
-/* functions */
-#define faacDecGetErrorMessage         NeAACDecGetErrorMessage
-#define faacDecSetConfiguration        NeAACDecSetConfiguration
-#define faacDecGetCurrentConfiguration NeAACDecGetCurrentConfiguration
-#define faacDecInit                    NeAACDecInit
-#define faacDecInit2                   NeAACDecInit2
-#define faacDecInitDRM                 NeAACDecInitDRM
-#define faacDecPostSeekReset           NeAACDecPostSeekReset
-#define faacDecOpen                    NeAACDecOpen
-#define faacDecClose                   NeAACDecClose
-#define faacDecDecode                  NeAACDecDecode
-#define AudioSpecificConfig            NeAACDecAudioSpecificConfig
-#endif
-
-
-#ifdef _WIN32
-  #pragma pack(push, 8)
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI __cdecl
-  #endif
-#else
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI
-  #endif
-#endif
-
-#define FAAD2_VERSION "2.7"
-
-/* object types for AAC */
-#define MAIN       1
-#define LC         2
-#define SSR        3
-#define LTP        4
-#define HE_AAC     5
-#define ER_LC     17
-#define ER_LTP    19
-#define LD        23
-#define DRM_ER_LC 27 /* special object type for DRM */
-
-/* header types */
-#define RAW        0
-#define ADIF       1
-#define ADTS       2
-#define LATM       3
-
-/* SBR signalling */
-#define NO_SBR           0
-#define SBR_UPSAMPLED    1
-#define SBR_DOWNSAMPLED  2
-#define NO_SBR_UPSAMPLED 3
-
-/* library output formats */
-#define FAAD_FMT_16BIT  1
-#define FAAD_FMT_24BIT  2
-#define FAAD_FMT_32BIT  3
-#define FAAD_FMT_FLOAT  4
-#define FAAD_FMT_FIXED  FAAD_FMT_FLOAT
-#define FAAD_FMT_DOUBLE 5
-
-/* Capabilities */
-#define LC_DEC_CAP           (1<<0) /* Can decode LC */
-#define MAIN_DEC_CAP         (1<<1) /* Can decode MAIN */
-#define LTP_DEC_CAP          (1<<2) /* Can decode LTP */
-#define LD_DEC_CAP           (1<<3) /* Can decode LD */
-#define ERROR_RESILIENCE_CAP (1<<4) /* Can decode ER */
-#define FIXED_POINT_CAP      (1<<5) /* Fixed point */
-
-/* Channel definitions */
-#define FRONT_CHANNEL_CENTER (1)
-#define FRONT_CHANNEL_LEFT   (2)
-#define FRONT_CHANNEL_RIGHT  (3)
-#define SIDE_CHANNEL_LEFT    (4)
-#define SIDE_CHANNEL_RIGHT   (5)
-#define BACK_CHANNEL_LEFT    (6)
-#define BACK_CHANNEL_RIGHT   (7)
-#define BACK_CHANNEL_CENTER  (8)
-#define LFE_CHANNEL          (9)
-#define UNKNOWN_CHANNEL      (0)
-
-/* DRM channel definitions */
-#define DRMCH_MONO          1
-#define DRMCH_STEREO        2
-#define DRMCH_SBR_MONO      3
-#define DRMCH_SBR_STEREO    4
-#define DRMCH_SBR_PS_STEREO 5
-
-
-/* A decode call can eat up to FAAD_MIN_STREAMSIZE bytes per decoded channel,
-   so at least so much bytes per channel should be available in this stream */
-#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */
-
-
-typedef void *NeAACDecHandle;
-
-typedef struct mp4AudioSpecificConfig
-{
-    /* Audio Specific Info */
-    unsigned char objectTypeIndex;
-    unsigned char samplingFrequencyIndex;
-    unsigned long samplingFrequency;
-    unsigned char channelsConfiguration;
-
-    /* GA Specific Info */
-    unsigned char frameLengthFlag;
-    unsigned char dependsOnCoreCoder;
-    unsigned short coreCoderDelay;
-    unsigned char extensionFlag;
-    unsigned char aacSectionDataResilienceFlag;
-    unsigned char aacScalefactorDataResilienceFlag;
-    unsigned char aacSpectralDataResilienceFlag;
-    unsigned char epConfig;
-
-    char sbr_present_flag;
-    char forceUpSampling;
-    char downSampledSBR;
-} mp4AudioSpecificConfig;
-
-typedef struct NeAACDecConfiguration
-{
-    unsigned char defObjectType;
-    unsigned long defSampleRate;
-    unsigned char outputFormat;
-    unsigned char downMatrix;
-    unsigned char useOldADTSFormat;
-    unsigned char dontUpSampleImplicitSBR;
-} NeAACDecConfiguration, *NeAACDecConfigurationPtr;
-
-typedef struct NeAACDecFrameInfo
-{
-    unsigned long bytesconsumed;
-    unsigned long samples;
-    unsigned char channels;
-    unsigned char error;
-    unsigned long samplerate;
-
-    /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */
-    unsigned char sbr;
-
-    /* MPEG-4 ObjectType */
-    unsigned char object_type;
-
-    /* AAC header type; MP4 will be signalled as RAW also */
-    unsigned char header_type;
-
-    /* multichannel configuration */
-    unsigned char num_front_channels;
-    unsigned char num_side_channels;
-    unsigned char num_back_channels;
-    unsigned char num_lfe_channels;
-    unsigned char channel_position[64];
-
-    /* PS: 0: off, 1: on */
-    unsigned char ps;
-} NeAACDecFrameInfo;
-
-char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode);
-
-unsigned long NEAACDECAPI NeAACDecGetCapabilities(void);
-
-NeAACDecHandle NEAACDECAPI NeAACDecOpen(void);
-
-NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder);
-
-unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder,
-                                                   NeAACDecConfigurationPtr config);
-
-/* Init the library based on info from the AAC file (ADTS/ADIF) */
-long NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder,
-                              unsigned char *buffer,
-                              unsigned long buffer_size,
-                              unsigned long *samplerate,
-                              unsigned char *channels);
-
-/* Init the library using a DecoderSpecificInfo */
-char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder,
-                               unsigned char *pBuffer,
-                               unsigned long SizeOfDecoderSpecificInfo,
-                               unsigned long *samplerate,
-                               unsigned char *channels);
-
-/* Init the library for DRM */
-char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hDecoder, unsigned long samplerate,
-                                 unsigned char channels);
-
-void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame);
-
-void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder);
-
-void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
-                                 NeAACDecFrameInfo *hInfo,
-                                 unsigned char *buffer,
-                                 unsigned long buffer_size);
-
-void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder,
-                                  NeAACDecFrameInfo *hInfo,
-                                  unsigned char *buffer,
-                                  unsigned long buffer_size,
-                                  void **sample_buffer,
-                                  unsigned long sample_buffer_size);
-
-char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer,
-                                             unsigned long buffer_size,
-                                             mp4AudioSpecificConfig *mp4ASC);
-
-#ifdef _WIN32
-  #pragma pack(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/debian/libfaad-dev/usr/lib/libfaad.a b/debian/libfaad-dev/usr/lib/libfaad.a
deleted file mode 100644
index d55c18b..0000000
Binary files a/debian/libfaad-dev/usr/lib/libfaad.a and /dev/null differ
diff --git a/debian/libfaad-dev/usr/lib/libfaad.la b/debian/libfaad-dev/usr/lib/libfaad.la
deleted file mode 100644
index e725739..0000000
--- a/debian/libfaad-dev/usr/lib/libfaad.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libfaad.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-4
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libfaad.so.2'
-
-# Names of this library.
-library_names='libfaad.so.2.0.0 libfaad.so.2 libfaad.so'
-
-# The name of the static archive.
-old_library='libfaad.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -lm'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libfaad.
-current=2
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'
diff --git a/debian/libfaad-dev/usr/lib/libfaad.so b/debian/libfaad-dev/usr/lib/libfaad.so
deleted file mode 120000
index a95c965..0000000
--- a/debian/libfaad-dev/usr/lib/libfaad.so
+++ /dev/null
@@ -1 +0,0 @@
-libfaad.so.2.0.0
\ No newline at end of file
diff --git a/debian/libfaad-dev/usr/share/doc/libfaad-dev/changelog.Debian.gz b/debian/libfaad-dev/usr/share/doc/libfaad-dev/changelog.Debian.gz
deleted file mode 100644
index 858404f..0000000
Binary files a/debian/libfaad-dev/usr/share/doc/libfaad-dev/changelog.Debian.gz and /dev/null differ
diff --git a/debian/libfaad-dev/usr/share/doc/libfaad-dev/changelog.gz b/debian/libfaad-dev/usr/share/doc/libfaad-dev/changelog.gz
deleted file mode 100644
index 0e11c56..0000000
Binary files a/debian/libfaad-dev/usr/share/doc/libfaad-dev/changelog.gz and /dev/null differ
diff --git a/debian/libfaad-dev/usr/share/doc/libfaad-dev/copyright b/debian/libfaad-dev/usr/share/doc/libfaad-dev/copyright
deleted file mode 100644
index 78e16be..0000000
--- a/debian/libfaad-dev/usr/share/doc/libfaad-dev/copyright
+++ /dev/null
@@ -1,75 +0,0 @@
-This package was debianized by Aubin Paul on Sun, 8 Dec 2002 12:05:10 -0500.
-This package was prepared for inclusion in Debian by Matthew W. S. Bell 
-<matthew at bells23.org.uk> in May 2006 
-
-It was downloaded from http://faac.sourceforge.net/index.php.
-Official website is now at http://www.audiocoding.com/
-CVS is still hosted by SourceForge.net
-
-Debian Authors:   Matthew W. S. Bell	<matthew at bells23.org.uk>
-                  Aubin Paul		<aubin at outlyer.org>
-Copyright:        2006, 2007, 2008	Matthew W. S. Bell
-                  200			Aubin Paul
-
-Upstream Authors: menno			<menno at audiocoding.com>
-		  Alexander Kurpiers	<a.kurpiers at nt.tu-darmstadt.de>
- 		  M. Bakker		<mbakker at nero.com>
-		  Ahead Software AG
-		  Nero AG
-Copyright:	  2002-2005		M. Bakker
-		  2003-2005		Ahead Software AG
-		  2003-2005		Nero AG
-
-Other Authors:	  John Edwards
-		  Bill May		<wmay at cisco.com>
-		  Quinnware
-		  VideoLAN
-Copyright:	  2002			John Edwards
-		  2003			Bill May
-		  1997-2002		Quinnware
-		  2004			VideoLAN
-
-License Declaration:
-
-The GPL may be found in the file /usr/share/common-licenses/GPL.
-
-The upstream source has the follwing license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden.
-
-The "appropriate copyright message" mentioned in section 2c of the GPLv2 must
-read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
----
-
-The aacDECdrop module has the following license declaration:
----
-This program is distributed under the GNU General Public License, version 2. A
-copy of this license is included with this source.
----
-
-Some files (extra components and plugins) and the Debian packaging have the
-following license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
----
diff --git a/debian/libfaad2.debhelper.log b/debian/libfaad2.debhelper.log
deleted file mode 100644
index 1c05317..0000000
--- a/debian/libfaad2.debhelper.log
+++ /dev/null
@@ -1,49 +0,0 @@
-dh_quilt_patch
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installcatalogs
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_bugfiles
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_pysupport
-dh_scrollkeeper
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
diff --git a/debian/libfaad2.postinst.debhelper b/debian/libfaad2.postinst.debhelper
deleted file mode 100644
index 3d89d3e..0000000
--- a/debian/libfaad2.postinst.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libfaad2.postrm.debhelper b/debian/libfaad2.postrm.debhelper
deleted file mode 100644
index 7f44047..0000000
--- a/debian/libfaad2.postrm.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libfaad2.substvars b/debian/libfaad2.substvars
deleted file mode 100644
index 59b0b3b..0000000
--- a/debian/libfaad2.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-shlibs:Depends=libc6 (>= 2.1.3)
-misc:Depends=
diff --git a/debian/libfaad2/DEBIAN/control b/debian/libfaad2/DEBIAN/control
deleted file mode 100644
index 2869826..0000000
--- a/debian/libfaad2/DEBIAN/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Package: libfaad2
-Source: faad2
-Version: 2.7-1
-Architecture: i386
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Installed-Size: 296
-Depends: libc6 (>= 2.1.3)
-Conflicts: libfaad2-0
-Replaces: libfaad2-0
-Section: libs
-Priority: optional
-Homepage: http://www.audiocoding.com/
-Description: freeware Advanced Audio Decoder - runtime files
- FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly
- decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC
- files.
- .
- This package contains the shared library.
diff --git a/debian/libfaad2/DEBIAN/md5sums b/debian/libfaad2/DEBIAN/md5sums
deleted file mode 100644
index 68ce6d9..0000000
--- a/debian/libfaad2/DEBIAN/md5sums
+++ /dev/null
@@ -1,4 +0,0 @@
-872727187898d91451a1da70d011c431  usr/share/doc/libfaad2/copyright
-d48a457b787d2e426113fad3ea1fd3f3  usr/share/doc/libfaad2/changelog.Debian.gz
-ea420291ba0f031bfa5722bc8abae1c8  usr/share/doc/libfaad2/changelog.gz
-16b42e5697e7890dcb312e4f09632bed  usr/lib/libfaad.so.2.0.0
diff --git a/debian/libfaad2/DEBIAN/postinst b/debian/libfaad2/DEBIAN/postinst
deleted file mode 100755
index 379f1fa..0000000
--- a/debian/libfaad2/DEBIAN/postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libfaad2/DEBIAN/postrm b/debian/libfaad2/DEBIAN/postrm
deleted file mode 100755
index 3e73d38..0000000
--- a/debian/libfaad2/DEBIAN/postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libfaad2/DEBIAN/shlibs b/debian/libfaad2/DEBIAN/shlibs
deleted file mode 100644
index 7ad3bdd..0000000
--- a/debian/libfaad2/DEBIAN/shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libfaad 2 libfaad2
diff --git a/debian/libfaad2/usr/lib/libfaad.so.2 b/debian/libfaad2/usr/lib/libfaad.so.2
deleted file mode 120000
index a95c965..0000000
--- a/debian/libfaad2/usr/lib/libfaad.so.2
+++ /dev/null
@@ -1 +0,0 @@
-libfaad.so.2.0.0
\ No newline at end of file
diff --git a/debian/libfaad2/usr/lib/libfaad.so.2.0.0 b/debian/libfaad2/usr/lib/libfaad.so.2.0.0
deleted file mode 100644
index 210f960..0000000
Binary files a/debian/libfaad2/usr/lib/libfaad.so.2.0.0 and /dev/null differ
diff --git a/debian/libfaad2/usr/share/doc/libfaad2/changelog.Debian.gz b/debian/libfaad2/usr/share/doc/libfaad2/changelog.Debian.gz
deleted file mode 100644
index 858404f..0000000
Binary files a/debian/libfaad2/usr/share/doc/libfaad2/changelog.Debian.gz and /dev/null differ
diff --git a/debian/libfaad2/usr/share/doc/libfaad2/changelog.gz b/debian/libfaad2/usr/share/doc/libfaad2/changelog.gz
deleted file mode 100644
index 0e11c56..0000000
Binary files a/debian/libfaad2/usr/share/doc/libfaad2/changelog.gz and /dev/null differ
diff --git a/debian/libfaad2/usr/share/doc/libfaad2/copyright b/debian/libfaad2/usr/share/doc/libfaad2/copyright
deleted file mode 100644
index 78e16be..0000000
--- a/debian/libfaad2/usr/share/doc/libfaad2/copyright
+++ /dev/null
@@ -1,75 +0,0 @@
-This package was debianized by Aubin Paul on Sun, 8 Dec 2002 12:05:10 -0500.
-This package was prepared for inclusion in Debian by Matthew W. S. Bell 
-<matthew at bells23.org.uk> in May 2006 
-
-It was downloaded from http://faac.sourceforge.net/index.php.
-Official website is now at http://www.audiocoding.com/
-CVS is still hosted by SourceForge.net
-
-Debian Authors:   Matthew W. S. Bell	<matthew at bells23.org.uk>
-                  Aubin Paul		<aubin at outlyer.org>
-Copyright:        2006, 2007, 2008	Matthew W. S. Bell
-                  200			Aubin Paul
-
-Upstream Authors: menno			<menno at audiocoding.com>
-		  Alexander Kurpiers	<a.kurpiers at nt.tu-darmstadt.de>
- 		  M. Bakker		<mbakker at nero.com>
-		  Ahead Software AG
-		  Nero AG
-Copyright:	  2002-2005		M. Bakker
-		  2003-2005		Ahead Software AG
-		  2003-2005		Nero AG
-
-Other Authors:	  John Edwards
-		  Bill May		<wmay at cisco.com>
-		  Quinnware
-		  VideoLAN
-Copyright:	  2002			John Edwards
-		  2003			Bill May
-		  1997-2002		Quinnware
-		  2004			VideoLAN
-
-License Declaration:
-
-The GPL may be found in the file /usr/share/common-licenses/GPL.
-
-The upstream source has the follwing license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden.
-
-The "appropriate copyright message" mentioned in section 2c of the GPLv2 must
-read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
----
-
-The aacDECdrop module has the following license declaration:
----
-This program is distributed under the GNU General Public License, version 2. A
-copy of this license is included with this source.
----
-
-Some files (extra components and plugins) and the Debian packaging have the
-following license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
----
diff --git a/debian/libmp4ff-dev.debhelper.log b/debian/libmp4ff-dev.debhelper.log
deleted file mode 100644
index 1c05317..0000000
--- a/debian/libmp4ff-dev.debhelper.log
+++ /dev/null
@@ -1,49 +0,0 @@
-dh_quilt_patch
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installcatalogs
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_bugfiles
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_pysupport
-dh_scrollkeeper
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
diff --git a/debian/libmp4ff-dev.substvars b/debian/libmp4ff-dev.substvars
deleted file mode 100644
index abd3ebe..0000000
--- a/debian/libmp4ff-dev.substvars
+++ /dev/null
@@ -1 +0,0 @@
-misc:Depends=
diff --git a/debian/libmp4ff-dev/DEBIAN/control b/debian/libmp4ff-dev/DEBIAN/control
deleted file mode 100644
index 36d6bfd..0000000
--- a/debian/libmp4ff-dev/DEBIAN/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Package: libmp4ff-dev
-Source: faad2
-Version: 2.7-1
-Architecture: i386
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Installed-Size: 116
-Conflicts: libfaad-dev (<< 2.7)
-Section: libdevel
-Priority: optional
-Homepage: http://www.audiocoding.com/
-Description: faad2 mp4ff library - development files
- FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly
- decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC
- files.
- .
- This package contains development files for the mp4ff library built from the
- faad2 source package.
diff --git a/debian/libmp4ff-dev/DEBIAN/md5sums b/debian/libmp4ff-dev/DEBIAN/md5sums
deleted file mode 100644
index bdaeb61..0000000
--- a/debian/libmp4ff-dev/DEBIAN/md5sums
+++ /dev/null
@@ -1,7 +0,0 @@
-872727187898d91451a1da70d011c431  usr/share/doc/libmp4ff-dev/copyright
-d48a457b787d2e426113fad3ea1fd3f3  usr/share/doc/libmp4ff-dev/changelog.Debian.gz
-ea420291ba0f031bfa5722bc8abae1c8  usr/share/doc/libmp4ff-dev/changelog.gz
-4ffe5e0d0b632d4b6507c07000b65c55  usr/lib/libmp4ff.a
-43b158ddc4c7c2d266666815217108d7  usr/lib/libmp4ff.la
-0dcca0b59a8e4ce6b3f39415010f651d  usr/include/mp4ff.h
-5ef7f72f9d6e9ac412848800d321e1d3  usr/include/mp4ffint.h
diff --git a/debian/libmp4ff-dev/usr/include/mp4ff.h b/debian/libmp4ff-dev/usr/include/mp4ff.h
deleted file mode 100644
index 17b7fe7..0000000
--- a/debian/libmp4ff-dev/usr/include/mp4ff.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-** $Id: mp4ff.h,v 1.27 2009/01/29 00:41:08 menno Exp $
-**/
-
-#ifndef MP4FF_H
-#define MP4FF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include "mp4ff_int_types.h"
-#endif
-
-/* file callback structure */
-typedef struct
-{
-    uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
-    uint32_t (*write)(void *udata, void *buffer, uint32_t length);
-    uint32_t (*seek)(void *user_data, uint64_t position);
-	uint32_t (*truncate)(void *user_data);
-    void *user_data;
-} mp4ff_callback_t;
-
-/* mp4 main file structure */
-typedef void* mp4ff_t;
-
-
-/* API */
-
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
-mp4ff_t *mp4ff_open_read_metaonly(mp4ff_callback_t *f);
-void mp4ff_close(mp4ff_t *f);
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_duration_use_offsets(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-int32_t mp4ff_find_sample_use_offsets(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int track, const int sample,
-                          unsigned char **audio_buffer,  unsigned int *bytes);
-
-int32_t mp4ff_read_sample_v2(mp4ff_t *f, const int track, const int sample,unsigned char *buffer);//returns 0 on error, number of bytes read on success, use mp4ff_read_sample_getsize() to check buffer size needed
-int32_t mp4ff_read_sample_getsize(mp4ff_t *f, const int track, const int sample);//returns 0 on error, buffer size needed for mp4ff_read_sample_v2() on success
-
-
-
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int track,
-                             unsigned char** ppBuf, unsigned int* pBufSize);
-int32_t mp4ff_get_track_type(const mp4ff_t *f, const int track);
-int32_t mp4ff_total_tracks(const mp4ff_t *f);
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int track);
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int track);
-
-uint32_t mp4ff_get_avg_bitrate(const mp4ff_t *f, const int32_t track);
-uint32_t mp4ff_get_max_bitrate(const mp4ff_t *f, const int32_t track);
-int64_t mp4ff_get_track_duration(const mp4ff_t *f, const int32_t track); //returns (-1) if unknown
-int64_t mp4ff_get_track_duration_use_offsets(const mp4ff_t *f, const int32_t track); //returns (-1) if unknown
-uint32_t mp4ff_get_sample_rate(const mp4ff_t *f, const int32_t track);
-uint32_t mp4ff_get_channel_count(const mp4ff_t * f,const int32_t track);
-uint32_t mp4ff_get_audio_type(const mp4ff_t * f,const int32_t track);
-
-
-/* metadata */
-int mp4ff_meta_get_num_items(const mp4ff_t *f);
-int mp4ff_meta_get_by_index(const mp4ff_t *f, unsigned int index,
-                            char **item, char **value);
-int mp4ff_meta_get_title(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_artist(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_writer(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_album(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_date(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_tool(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_comment(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_genre(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_track(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_disc(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_totaltracks(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_totaldiscs(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_compilation(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_tempo(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value);
-#ifdef USE_TAGGING
-
-/* metadata tag structure */
-typedef struct
-{
-    char *item;
-    char *value;
-} mp4ff_tag_t;
-
-/* metadata list structure */
-typedef struct
-{
-    mp4ff_tag_t *tags;
-    uint32_t count;
-} mp4ff_metadata_t;
-
-int32_t mp4ff_meta_update(mp4ff_callback_t *f,const mp4ff_metadata_t * data);
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/debian/libmp4ff-dev/usr/include/mp4ffint.h b/debian/libmp4ff-dev/usr/include/mp4ffint.h
deleted file mode 100644
index c92b588..0000000
--- a/debian/libmp4ff-dev/usr/include/mp4ffint.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-** $Id: mp4ffint.h,v 1.26 2009/01/25 20:14:34 menno Exp $
-**/
-
-#ifndef MP4FF_INTERNAL_H
-#define MP4FF_INTERNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "mp4ff_int_types.h"
-#include <stdlib.h>
-
-#define MAX_TRACKS 1024
-#define TRACK_UNKNOWN 0
-#define TRACK_AUDIO   1
-#define TRACK_VIDEO   2
-#define TRACK_SYSTEM  3
-
-
-#define SUBATOMIC 128
-
-/* atoms without subatoms */
-#define ATOM_FTYP 129
-#define ATOM_MDAT 130
-#define ATOM_MVHD 131
-#define ATOM_TKHD 132
-#define ATOM_TREF 133
-#define ATOM_MDHD 134
-#define ATOM_VMHD 135
-#define ATOM_SMHD 136
-#define ATOM_HMHD 137
-#define ATOM_STSD 138
-#define ATOM_STTS 139
-#define ATOM_STSZ 140
-#define ATOM_STZ2 141
-#define ATOM_STCO 142
-#define ATOM_STSC 143
-#define ATOM_MP4A 144
-#define ATOM_MP4V 145
-#define ATOM_MP4S 146
-#define ATOM_ESDS 147
-#define ATOM_META 148 /* iTunes Metadata box */
-#define ATOM_NAME 149 /* iTunes Metadata name box */
-#define ATOM_DATA 150 /* iTunes Metadata data box */
-#define ATOM_CTTS 151
-#define ATOM_FRMA 152
-#define ATOM_IVIV 153
-#define ATOM_PRIV 154
-#define ATOM_USER 155
-#define ATOM_KEY  156
-
-#define ATOM_ALBUM_ARTIST	157
-#define ATOM_CONTENTGROUP   158
-#define ATOM_LYRICS         159
-#define ATOM_DESCRIPTION    160
-#define ATOM_NETWORK        161
-#define ATOM_SHOW           162
-#define ATOM_EPISODENAME    163
-#define ATOM_SORTTITLE      164
-#define ATOM_SORTALBUM      165
-#define ATOM_SORTARTIST     166
-#define ATOM_SORTALBUMARTIST    167
-#define ATOM_SORTWRITER     168
-#define ATOM_SORTSHOW       169
-#define ATOM_SEASON         170
-#define ATOM_EPISODE        171
-#define ATOM_PODCAST        172
-
-#define ATOM_UNKNOWN 255
-#define ATOM_FREE ATOM_UNKNOWN
-#define ATOM_SKIP ATOM_UNKNOWN
-
-/* atoms with subatoms */
-#define ATOM_MOOV 1
-#define ATOM_TRAK 2
-#define ATOM_EDTS 3
-#define ATOM_MDIA 4
-#define ATOM_MINF 5
-#define ATOM_STBL 6
-#define ATOM_UDTA 7
-#define ATOM_ILST 8 /* iTunes Metadata list */
-#define ATOM_TITLE 9
-#define ATOM_ARTIST 10
-#define ATOM_WRITER 11
-#define ATOM_ALBUM 12
-#define ATOM_DATE 13
-#define ATOM_TOOL 14
-#define ATOM_COMMENT 15
-#define ATOM_GENRE1 16
-#define ATOM_TRACK 17
-#define ATOM_DISC 18
-#define ATOM_COMPILATION 19
-#define ATOM_GENRE2 20
-#define ATOM_TEMPO 21
-#define ATOM_COVER 22
-#define ATOM_DRMS 23
-#define ATOM_SINF 24
-#define ATOM_SCHI 25
-
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"   
-#endif
-
-#if !(defined(_WIN32) || defined(_WIN32_WCE))
-#define stricmp strcasecmp
-#else
-#define stricmp _stricmp
-#define strdup _strdup
-#endif
-
-/* file callback structure */
-typedef struct
-{
-    uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
-    uint32_t (*write)(void *udata, void *buffer, uint32_t length);
-    uint32_t (*seek)(void *user_data, uint64_t position);
-    uint32_t (*truncate)(void *user_data);
-    void *user_data;
-} mp4ff_callback_t;
-
-
-/* metadata tag structure */
-typedef struct
-{
-    char *item;
-    char *value;
-} mp4ff_tag_t;
-
-/* metadata list structure */
-typedef struct
-{
-    mp4ff_tag_t *tags;
-    uint32_t count;
-} mp4ff_metadata_t;
-
-
-typedef struct
-{
-    int32_t type;
-    int32_t channelCount;
-    int32_t sampleSize;
-    uint16_t sampleRate;
-    int32_t audioType;
-
-    /* stsd */
-    int32_t stsd_entry_count;
-
-    /* stsz */
-    int32_t stsz_sample_size;
-    int32_t stsz_sample_count;
-    int32_t *stsz_table;
-
-    /* stts */
-    int32_t stts_entry_count;
-    int32_t *stts_sample_count;
-    int32_t *stts_sample_delta;
-
-    /* stsc */
-    int32_t stsc_entry_count;
-    int32_t *stsc_first_chunk;
-    int32_t *stsc_samples_per_chunk;
-    int32_t *stsc_sample_desc_index;
-
-    /* stsc */
-    int32_t stco_entry_count;
-    int32_t *stco_chunk_offset;
-
-    /* ctts */
-    int32_t ctts_entry_count;
-    int32_t *ctts_sample_count;
-    int32_t *ctts_sample_offset;
-
-    /* esde */
-    uint8_t *decoderConfig;
-    int32_t decoderConfigLen;
-
-    uint32_t maxBitrate;
-    uint32_t avgBitrate;
-
-    uint32_t timeScale;
-    uint64_t duration;
-
-} mp4ff_track_t;
-
-/* mp4 main file structure */
-typedef struct
-{
-    /* stream to read from */
-    mp4ff_callback_t *stream;
-    int64_t current_position;
-
-    int32_t moov_read;
-    uint64_t moov_offset;
-    uint64_t moov_size;
-    uint8_t last_atom;
-    uint64_t file_size;
-
-    /* mvhd */
-    int32_t time_scale;
-    int32_t duration;
-
-    /* incremental track index while reading the file */
-    int32_t total_tracks;
-
-    /* track data */
-    mp4ff_track_t *track[MAX_TRACKS];
-
-    /* metadata */
-    mp4ff_metadata_t tags;
-} mp4ff_t;
-
-
-
-
-/* mp4util.c */
-int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size);
-int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size);
-uint64_t mp4ff_read_int64(mp4ff_t *f);
-uint32_t mp4ff_read_int32(mp4ff_t *f);
-uint32_t mp4ff_read_int24(mp4ff_t *f);
-uint16_t mp4ff_read_int16(mp4ff_t *f);
-uint8_t mp4ff_read_char(mp4ff_t *f);
-int32_t mp4ff_write_int32(mp4ff_t *f,const uint32_t data);
-uint32_t mp4ff_read_mp4_descr_length(mp4ff_t *f);
-int64_t mp4ff_position(const mp4ff_t *f);
-int32_t mp4ff_set_position(mp4ff_t *f, const int64_t position);
-int32_t mp4ff_truncate(mp4ff_t * f);
-char * mp4ff_read_string(mp4ff_t * f,uint32_t length);
-
-/* mp4atom.c */
-static int32_t mp4ff_atom_get_size(const int8_t *data);
-static int32_t mp4ff_atom_compare(const int8_t a1, const int8_t b1, const int8_t c1, const int8_t d1,
-                                  const int8_t a2, const int8_t b2, const int8_t c2, const int8_t d2);
-static uint8_t mp4ff_atom_name_to_type(const int8_t a, const int8_t b, const int8_t c, const int8_t d);
-uint64_t mp4ff_atom_read_header(mp4ff_t *f, uint8_t *atom_type, uint8_t *header_size);
-static int32_t mp4ff_read_stsz(mp4ff_t *f);
-static int32_t mp4ff_read_esds(mp4ff_t *f);
-static int32_t mp4ff_read_mp4a(mp4ff_t *f);
-static int32_t mp4ff_read_stsd(mp4ff_t *f);
-static int32_t mp4ff_read_stsc(mp4ff_t *f);
-static int32_t mp4ff_read_stco(mp4ff_t *f);
-static int32_t mp4ff_read_stts(mp4ff_t *f);
-#ifdef USE_TAGGING
-static int32_t mp4ff_read_meta(mp4ff_t *f, const uint64_t size);
-#endif
-int32_t mp4ff_atom_read(mp4ff_t *f, const int32_t size, const uint8_t atom_type);
-
-/* mp4sample.c */
-static int32_t mp4ff_chunk_of_sample(const mp4ff_t *f, const int32_t track, const int32_t sample,
-                                     int32_t *chunk_sample, int32_t *chunk);
-static int32_t mp4ff_chunk_to_offset(const mp4ff_t *f, const int32_t track, const int32_t chunk);
-static int32_t mp4ff_sample_range_size(const mp4ff_t *f, const int32_t track,
-                                       const int32_t chunk_sample, const int32_t sample);
-static int32_t mp4ff_sample_to_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_audio_frame_size(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample);
-
-#ifdef USE_TAGGING
-/* mp4meta.c */
-static int32_t mp4ff_tag_add_field(mp4ff_metadata_t *tags, const char *item, const char *value);
-static int32_t mp4ff_tag_set_field(mp4ff_metadata_t *tags, const char *item, const char *value);
-static int32_t mp4ff_set_metadata_name(mp4ff_t *f, const uint8_t atom_type, char **name);
-static int32_t mp4ff_parse_tag(mp4ff_t *f, const uint8_t parent_atom_type, const int32_t size);
-static int32_t mp4ff_meta_find_by_name(const mp4ff_t *f, const char *item, char **value);
-int32_t mp4ff_parse_metadata(mp4ff_t *f, const int32_t size);
-int32_t mp4ff_tag_delete(mp4ff_metadata_t *tags);
-int32_t mp4ff_meta_get_num_items(const mp4ff_t *f);
-int32_t mp4ff_meta_get_by_index(const mp4ff_t *f, uint32_t index,
-                            char **item, char **value);
-int32_t mp4ff_meta_get_title(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_artist(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_writer(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_album(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_date(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_tool(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_comment(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_genre(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_track(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_disc(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_compilation(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_tempo(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value);
-#endif
-
-/* mp4ff.c */
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
-#ifdef USE_TAGGING
-mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f);
-#endif
-void mp4ff_close(mp4ff_t *ff);
-//void mp4ff_track_add(mp4ff_t *f);
-int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size,int meta_only);
-int32_t parse_atoms(mp4ff_t *f,int meta_only);
-
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int32_t track, const int32_t sample,
-                          uint8_t **audio_buffer,  uint32_t *bytes);
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int32_t track,
-                                 uint8_t** ppBuf, uint32_t* pBufSize);
-int32_t mp4ff_total_tracks(const mp4ff_t *f);
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int32_t track);
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int32_t track);
-
-uint32_t mp4ff_meta_genre_to_index(const char * genrestr);//returns 1-based index, 0 if not found
-const char * mp4ff_meta_index_to_genre(uint32_t idx);//returns pointer to static string
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/debian/libmp4ff-dev/usr/lib/libmp4ff.a b/debian/libmp4ff-dev/usr/lib/libmp4ff.a
deleted file mode 100644
index a0c7d05..0000000
Binary files a/debian/libmp4ff-dev/usr/lib/libmp4ff.a and /dev/null differ
diff --git a/debian/libmp4ff-dev/usr/lib/libmp4ff.la b/debian/libmp4ff-dev/usr/lib/libmp4ff.la
deleted file mode 100644
index cf49fe9..0000000
--- a/debian/libmp4ff-dev/usr/lib/libmp4ff.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libmp4ff.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-4
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libmp4ff.so.0'
-
-# Names of this library.
-library_names='libmp4ff.so.0.0.0 libmp4ff.so.0 libmp4ff.so'
-
-# The name of the static archive.
-old_library='libmp4ff.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libmp4ff.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'
diff --git a/debian/libmp4ff-dev/usr/lib/libmp4ff.so b/debian/libmp4ff-dev/usr/lib/libmp4ff.so
deleted file mode 120000
index 459b975..0000000
--- a/debian/libmp4ff-dev/usr/lib/libmp4ff.so
+++ /dev/null
@@ -1 +0,0 @@
-libmp4ff.so.0.0.0
\ No newline at end of file
diff --git a/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/changelog.Debian.gz b/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/changelog.Debian.gz
deleted file mode 100644
index 858404f..0000000
Binary files a/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/changelog.Debian.gz and /dev/null differ
diff --git a/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/changelog.gz b/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/changelog.gz
deleted file mode 100644
index 0e11c56..0000000
Binary files a/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/changelog.gz and /dev/null differ
diff --git a/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/copyright b/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/copyright
deleted file mode 100644
index 78e16be..0000000
--- a/debian/libmp4ff-dev/usr/share/doc/libmp4ff-dev/copyright
+++ /dev/null
@@ -1,75 +0,0 @@
-This package was debianized by Aubin Paul on Sun, 8 Dec 2002 12:05:10 -0500.
-This package was prepared for inclusion in Debian by Matthew W. S. Bell 
-<matthew at bells23.org.uk> in May 2006 
-
-It was downloaded from http://faac.sourceforge.net/index.php.
-Official website is now at http://www.audiocoding.com/
-CVS is still hosted by SourceForge.net
-
-Debian Authors:   Matthew W. S. Bell	<matthew at bells23.org.uk>
-                  Aubin Paul		<aubin at outlyer.org>
-Copyright:        2006, 2007, 2008	Matthew W. S. Bell
-                  200			Aubin Paul
-
-Upstream Authors: menno			<menno at audiocoding.com>
-		  Alexander Kurpiers	<a.kurpiers at nt.tu-darmstadt.de>
- 		  M. Bakker		<mbakker at nero.com>
-		  Ahead Software AG
-		  Nero AG
-Copyright:	  2002-2005		M. Bakker
-		  2003-2005		Ahead Software AG
-		  2003-2005		Nero AG
-
-Other Authors:	  John Edwards
-		  Bill May		<wmay at cisco.com>
-		  Quinnware
-		  VideoLAN
-Copyright:	  2002			John Edwards
-		  2003			Bill May
-		  1997-2002		Quinnware
-		  2004			VideoLAN
-
-License Declaration:
-
-The GPL may be found in the file /usr/share/common-licenses/GPL.
-
-The upstream source has the follwing license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden.
-
-The "appropriate copyright message" mentioned in section 2c of the GPLv2 must
-read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
----
-
-The aacDECdrop module has the following license declaration:
----
-This program is distributed under the GNU General Public License, version 2. A
-copy of this license is included with this source.
----
-
-Some files (extra components and plugins) and the Debian packaging have the
-following license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
----
diff --git a/debian/libmp4ff0.debhelper.log b/debian/libmp4ff0.debhelper.log
deleted file mode 100644
index 1c05317..0000000
--- a/debian/libmp4ff0.debhelper.log
+++ /dev/null
@@ -1,49 +0,0 @@
-dh_quilt_patch
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installcatalogs
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_bugfiles
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_pysupport
-dh_scrollkeeper
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
diff --git a/debian/libmp4ff0.postinst.debhelper b/debian/libmp4ff0.postinst.debhelper
deleted file mode 100644
index 3d89d3e..0000000
--- a/debian/libmp4ff0.postinst.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libmp4ff0.postrm.debhelper b/debian/libmp4ff0.postrm.debhelper
deleted file mode 100644
index 7f44047..0000000
--- a/debian/libmp4ff0.postrm.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libmp4ff0.substvars b/debian/libmp4ff0.substvars
deleted file mode 100644
index 59b0b3b..0000000
--- a/debian/libmp4ff0.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-shlibs:Depends=libc6 (>= 2.1.3)
-misc:Depends=
diff --git a/debian/libmp4ff0/DEBIAN/control b/debian/libmp4ff0/DEBIAN/control
deleted file mode 100644
index f538451..0000000
--- a/debian/libmp4ff0/DEBIAN/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Package: libmp4ff0
-Source: faad2
-Version: 2.7-1
-Architecture: i386
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Installed-Size: 88
-Depends: libc6 (>= 2.1.3)
-Section: libs
-Priority: optional
-Homepage: http://www.audiocoding.com/
-Description: faad2 mp4ff library - shared library
- FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly
- decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC
- files.
- .
- This package contains the shared library for the mp4ff library built from the
- faad2 source package.
diff --git a/debian/libmp4ff0/DEBIAN/md5sums b/debian/libmp4ff0/DEBIAN/md5sums
deleted file mode 100644
index 2bf9ece..0000000
--- a/debian/libmp4ff0/DEBIAN/md5sums
+++ /dev/null
@@ -1,4 +0,0 @@
-872727187898d91451a1da70d011c431  usr/share/doc/libmp4ff0/copyright
-d48a457b787d2e426113fad3ea1fd3f3  usr/share/doc/libmp4ff0/changelog.Debian.gz
-ea420291ba0f031bfa5722bc8abae1c8  usr/share/doc/libmp4ff0/changelog.gz
-3cc83b389a50a70034dfb3050bd08c0d  usr/lib/libmp4ff.so.0.0.0
diff --git a/debian/libmp4ff0/DEBIAN/postinst b/debian/libmp4ff0/DEBIAN/postinst
deleted file mode 100755
index 379f1fa..0000000
--- a/debian/libmp4ff0/DEBIAN/postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libmp4ff0/DEBIAN/postrm b/debian/libmp4ff0/DEBIAN/postrm
deleted file mode 100755
index 3e73d38..0000000
--- a/debian/libmp4ff0/DEBIAN/postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libmp4ff0/DEBIAN/shlibs b/debian/libmp4ff0/DEBIAN/shlibs
deleted file mode 100644
index 6c1d94e..0000000
--- a/debian/libmp4ff0/DEBIAN/shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libmp4ff 0 libmp4ff0
diff --git a/debian/libmp4ff0/usr/lib/libmp4ff.so.0 b/debian/libmp4ff0/usr/lib/libmp4ff.so.0
deleted file mode 120000
index 459b975..0000000
--- a/debian/libmp4ff0/usr/lib/libmp4ff.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libmp4ff.so.0.0.0
\ No newline at end of file
diff --git a/debian/libmp4ff0/usr/lib/libmp4ff.so.0.0.0 b/debian/libmp4ff0/usr/lib/libmp4ff.so.0.0.0
deleted file mode 100644
index 1e4e613..0000000
Binary files a/debian/libmp4ff0/usr/lib/libmp4ff.so.0.0.0 and /dev/null differ
diff --git a/debian/libmp4ff0/usr/share/doc/libmp4ff0/changelog.Debian.gz b/debian/libmp4ff0/usr/share/doc/libmp4ff0/changelog.Debian.gz
deleted file mode 100644
index 858404f..0000000
Binary files a/debian/libmp4ff0/usr/share/doc/libmp4ff0/changelog.Debian.gz and /dev/null differ
diff --git a/debian/libmp4ff0/usr/share/doc/libmp4ff0/changelog.gz b/debian/libmp4ff0/usr/share/doc/libmp4ff0/changelog.gz
deleted file mode 100644
index 0e11c56..0000000
Binary files a/debian/libmp4ff0/usr/share/doc/libmp4ff0/changelog.gz and /dev/null differ
diff --git a/debian/libmp4ff0/usr/share/doc/libmp4ff0/copyright b/debian/libmp4ff0/usr/share/doc/libmp4ff0/copyright
deleted file mode 100644
index 78e16be..0000000
--- a/debian/libmp4ff0/usr/share/doc/libmp4ff0/copyright
+++ /dev/null
@@ -1,75 +0,0 @@
-This package was debianized by Aubin Paul on Sun, 8 Dec 2002 12:05:10 -0500.
-This package was prepared for inclusion in Debian by Matthew W. S. Bell 
-<matthew at bells23.org.uk> in May 2006 
-
-It was downloaded from http://faac.sourceforge.net/index.php.
-Official website is now at http://www.audiocoding.com/
-CVS is still hosted by SourceForge.net
-
-Debian Authors:   Matthew W. S. Bell	<matthew at bells23.org.uk>
-                  Aubin Paul		<aubin at outlyer.org>
-Copyright:        2006, 2007, 2008	Matthew W. S. Bell
-                  200			Aubin Paul
-
-Upstream Authors: menno			<menno at audiocoding.com>
-		  Alexander Kurpiers	<a.kurpiers at nt.tu-darmstadt.de>
- 		  M. Bakker		<mbakker at nero.com>
-		  Ahead Software AG
-		  Nero AG
-Copyright:	  2002-2005		M. Bakker
-		  2003-2005		Ahead Software AG
-		  2003-2005		Nero AG
-
-Other Authors:	  John Edwards
-		  Bill May		<wmay at cisco.com>
-		  Quinnware
-		  VideoLAN
-Copyright:	  2002			John Edwards
-		  2003			Bill May
-		  1997-2002		Quinnware
-		  2004			VideoLAN
-
-License Declaration:
-
-The GPL may be found in the file /usr/share/common-licenses/GPL.
-
-The upstream source has the follwing license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden.
-
-The "appropriate copyright message" mentioned in section 2c of the GPLv2 must
-read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
----
-
-The aacDECdrop module has the following license declaration:
----
-This program is distributed under the GNU General Public License, version 2. A
-copy of this license is included with this source.
----
-
-Some files (extra components and plugins) and the Debian packaging have the
-following license declaration:
----
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
----
diff --git a/debian/rules b/debian/rules
index c1c493a..e0f0a71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_configure:
 	libtoolize --automake --copy -f
 	automake --add-missing --copy -f
 	autoconf -f
-	./configure --prefix=/usr --with-drm
+	./configure --prefix=/usr
 
 override_dh_strip:
 	dh_strip --dbg-package=faad2-dbg
diff --git a/debian/tmp/usr/bin/faad b/debian/tmp/usr/bin/faad
deleted file mode 100755
index 1c87dcd..0000000
Binary files a/debian/tmp/usr/bin/faad and /dev/null differ
diff --git a/debian/tmp/usr/include/faad.h b/debian/tmp/usr/include/faad.h
deleted file mode 100644
index 72f4072..0000000
--- a/debian/tmp/usr/include/faad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-** $Id: faad.h,v 1.51 2007/11/01 12:33:29 menno Exp $
-**/
-
-/* warn people for update */
-#pragma message("please update faad2 include filename and function names!")
-
-/* Backwards compatible link */
-#include "neaacdec.h"
diff --git a/debian/tmp/usr/include/mp4ff.h b/debian/tmp/usr/include/mp4ff.h
deleted file mode 100644
index 17b7fe7..0000000
--- a/debian/tmp/usr/include/mp4ff.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-** $Id: mp4ff.h,v 1.27 2009/01/29 00:41:08 menno Exp $
-**/
-
-#ifndef MP4FF_H
-#define MP4FF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include "mp4ff_int_types.h"
-#endif
-
-/* file callback structure */
-typedef struct
-{
-    uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
-    uint32_t (*write)(void *udata, void *buffer, uint32_t length);
-    uint32_t (*seek)(void *user_data, uint64_t position);
-	uint32_t (*truncate)(void *user_data);
-    void *user_data;
-} mp4ff_callback_t;
-
-/* mp4 main file structure */
-typedef void* mp4ff_t;
-
-
-/* API */
-
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
-mp4ff_t *mp4ff_open_read_metaonly(mp4ff_callback_t *f);
-void mp4ff_close(mp4ff_t *f);
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_duration_use_offsets(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-int32_t mp4ff_find_sample_use_offsets(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int track, const int sample,
-                          unsigned char **audio_buffer,  unsigned int *bytes);
-
-int32_t mp4ff_read_sample_v2(mp4ff_t *f, const int track, const int sample,unsigned char *buffer);//returns 0 on error, number of bytes read on success, use mp4ff_read_sample_getsize() to check buffer size needed
-int32_t mp4ff_read_sample_getsize(mp4ff_t *f, const int track, const int sample);//returns 0 on error, buffer size needed for mp4ff_read_sample_v2() on success
-
-
-
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int track,
-                             unsigned char** ppBuf, unsigned int* pBufSize);
-int32_t mp4ff_get_track_type(const mp4ff_t *f, const int track);
-int32_t mp4ff_total_tracks(const mp4ff_t *f);
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int track);
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int track);
-
-uint32_t mp4ff_get_avg_bitrate(const mp4ff_t *f, const int32_t track);
-uint32_t mp4ff_get_max_bitrate(const mp4ff_t *f, const int32_t track);
-int64_t mp4ff_get_track_duration(const mp4ff_t *f, const int32_t track); //returns (-1) if unknown
-int64_t mp4ff_get_track_duration_use_offsets(const mp4ff_t *f, const int32_t track); //returns (-1) if unknown
-uint32_t mp4ff_get_sample_rate(const mp4ff_t *f, const int32_t track);
-uint32_t mp4ff_get_channel_count(const mp4ff_t * f,const int32_t track);
-uint32_t mp4ff_get_audio_type(const mp4ff_t * f,const int32_t track);
-
-
-/* metadata */
-int mp4ff_meta_get_num_items(const mp4ff_t *f);
-int mp4ff_meta_get_by_index(const mp4ff_t *f, unsigned int index,
-                            char **item, char **value);
-int mp4ff_meta_get_title(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_artist(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_writer(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_album(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_date(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_tool(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_comment(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_genre(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_track(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_disc(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_totaltracks(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_totaldiscs(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_compilation(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_tempo(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value);
-#ifdef USE_TAGGING
-
-/* metadata tag structure */
-typedef struct
-{
-    char *item;
-    char *value;
-} mp4ff_tag_t;
-
-/* metadata list structure */
-typedef struct
-{
-    mp4ff_tag_t *tags;
-    uint32_t count;
-} mp4ff_metadata_t;
-
-int32_t mp4ff_meta_update(mp4ff_callback_t *f,const mp4ff_metadata_t * data);
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/debian/tmp/usr/include/mp4ffint.h b/debian/tmp/usr/include/mp4ffint.h
deleted file mode 100644
index c92b588..0000000
--- a/debian/tmp/usr/include/mp4ffint.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-** $Id: mp4ffint.h,v 1.26 2009/01/25 20:14:34 menno Exp $
-**/
-
-#ifndef MP4FF_INTERNAL_H
-#define MP4FF_INTERNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "mp4ff_int_types.h"
-#include <stdlib.h>
-
-#define MAX_TRACKS 1024
-#define TRACK_UNKNOWN 0
-#define TRACK_AUDIO   1
-#define TRACK_VIDEO   2
-#define TRACK_SYSTEM  3
-
-
-#define SUBATOMIC 128
-
-/* atoms without subatoms */
-#define ATOM_FTYP 129
-#define ATOM_MDAT 130
-#define ATOM_MVHD 131
-#define ATOM_TKHD 132
-#define ATOM_TREF 133
-#define ATOM_MDHD 134
-#define ATOM_VMHD 135
-#define ATOM_SMHD 136
-#define ATOM_HMHD 137
-#define ATOM_STSD 138
-#define ATOM_STTS 139
-#define ATOM_STSZ 140
-#define ATOM_STZ2 141
-#define ATOM_STCO 142
-#define ATOM_STSC 143
-#define ATOM_MP4A 144
-#define ATOM_MP4V 145
-#define ATOM_MP4S 146
-#define ATOM_ESDS 147
-#define ATOM_META 148 /* iTunes Metadata box */
-#define ATOM_NAME 149 /* iTunes Metadata name box */
-#define ATOM_DATA 150 /* iTunes Metadata data box */
-#define ATOM_CTTS 151
-#define ATOM_FRMA 152
-#define ATOM_IVIV 153
-#define ATOM_PRIV 154
-#define ATOM_USER 155
-#define ATOM_KEY  156
-
-#define ATOM_ALBUM_ARTIST	157
-#define ATOM_CONTENTGROUP   158
-#define ATOM_LYRICS         159
-#define ATOM_DESCRIPTION    160
-#define ATOM_NETWORK        161
-#define ATOM_SHOW           162
-#define ATOM_EPISODENAME    163
-#define ATOM_SORTTITLE      164
-#define ATOM_SORTALBUM      165
-#define ATOM_SORTARTIST     166
-#define ATOM_SORTALBUMARTIST    167
-#define ATOM_SORTWRITER     168
-#define ATOM_SORTSHOW       169
-#define ATOM_SEASON         170
-#define ATOM_EPISODE        171
-#define ATOM_PODCAST        172
-
-#define ATOM_UNKNOWN 255
-#define ATOM_FREE ATOM_UNKNOWN
-#define ATOM_SKIP ATOM_UNKNOWN
-
-/* atoms with subatoms */
-#define ATOM_MOOV 1
-#define ATOM_TRAK 2
-#define ATOM_EDTS 3
-#define ATOM_MDIA 4
-#define ATOM_MINF 5
-#define ATOM_STBL 6
-#define ATOM_UDTA 7
-#define ATOM_ILST 8 /* iTunes Metadata list */
-#define ATOM_TITLE 9
-#define ATOM_ARTIST 10
-#define ATOM_WRITER 11
-#define ATOM_ALBUM 12
-#define ATOM_DATE 13
-#define ATOM_TOOL 14
-#define ATOM_COMMENT 15
-#define ATOM_GENRE1 16
-#define ATOM_TRACK 17
-#define ATOM_DISC 18
-#define ATOM_COMPILATION 19
-#define ATOM_GENRE2 20
-#define ATOM_TEMPO 21
-#define ATOM_COVER 22
-#define ATOM_DRMS 23
-#define ATOM_SINF 24
-#define ATOM_SCHI 25
-
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"   
-#endif
-
-#if !(defined(_WIN32) || defined(_WIN32_WCE))
-#define stricmp strcasecmp
-#else
-#define stricmp _stricmp
-#define strdup _strdup
-#endif
-
-/* file callback structure */
-typedef struct
-{
-    uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
-    uint32_t (*write)(void *udata, void *buffer, uint32_t length);
-    uint32_t (*seek)(void *user_data, uint64_t position);
-    uint32_t (*truncate)(void *user_data);
-    void *user_data;
-} mp4ff_callback_t;
-
-
-/* metadata tag structure */
-typedef struct
-{
-    char *item;
-    char *value;
-} mp4ff_tag_t;
-
-/* metadata list structure */
-typedef struct
-{
-    mp4ff_tag_t *tags;
-    uint32_t count;
-} mp4ff_metadata_t;
-
-
-typedef struct
-{
-    int32_t type;
-    int32_t channelCount;
-    int32_t sampleSize;
-    uint16_t sampleRate;
-    int32_t audioType;
-
-    /* stsd */
-    int32_t stsd_entry_count;
-
-    /* stsz */
-    int32_t stsz_sample_size;
-    int32_t stsz_sample_count;
-    int32_t *stsz_table;
-
-    /* stts */
-    int32_t stts_entry_count;
-    int32_t *stts_sample_count;
-    int32_t *stts_sample_delta;
-
-    /* stsc */
-    int32_t stsc_entry_count;
-    int32_t *stsc_first_chunk;
-    int32_t *stsc_samples_per_chunk;
-    int32_t *stsc_sample_desc_index;
-
-    /* stsc */
-    int32_t stco_entry_count;
-    int32_t *stco_chunk_offset;
-
-    /* ctts */
-    int32_t ctts_entry_count;
-    int32_t *ctts_sample_count;
-    int32_t *ctts_sample_offset;
-
-    /* esde */
-    uint8_t *decoderConfig;
-    int32_t decoderConfigLen;
-
-    uint32_t maxBitrate;
-    uint32_t avgBitrate;
-
-    uint32_t timeScale;
-    uint64_t duration;
-
-} mp4ff_track_t;
-
-/* mp4 main file structure */
-typedef struct
-{
-    /* stream to read from */
-    mp4ff_callback_t *stream;
-    int64_t current_position;
-
-    int32_t moov_read;
-    uint64_t moov_offset;
-    uint64_t moov_size;
-    uint8_t last_atom;
-    uint64_t file_size;
-
-    /* mvhd */
-    int32_t time_scale;
-    int32_t duration;
-
-    /* incremental track index while reading the file */
-    int32_t total_tracks;
-
-    /* track data */
-    mp4ff_track_t *track[MAX_TRACKS];
-
-    /* metadata */
-    mp4ff_metadata_t tags;
-} mp4ff_t;
-
-
-
-
-/* mp4util.c */
-int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size);
-int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size);
-uint64_t mp4ff_read_int64(mp4ff_t *f);
-uint32_t mp4ff_read_int32(mp4ff_t *f);
-uint32_t mp4ff_read_int24(mp4ff_t *f);
-uint16_t mp4ff_read_int16(mp4ff_t *f);
-uint8_t mp4ff_read_char(mp4ff_t *f);
-int32_t mp4ff_write_int32(mp4ff_t *f,const uint32_t data);
-uint32_t mp4ff_read_mp4_descr_length(mp4ff_t *f);
-int64_t mp4ff_position(const mp4ff_t *f);
-int32_t mp4ff_set_position(mp4ff_t *f, const int64_t position);
-int32_t mp4ff_truncate(mp4ff_t * f);
-char * mp4ff_read_string(mp4ff_t * f,uint32_t length);
-
-/* mp4atom.c */
-static int32_t mp4ff_atom_get_size(const int8_t *data);
-static int32_t mp4ff_atom_compare(const int8_t a1, const int8_t b1, const int8_t c1, const int8_t d1,
-                                  const int8_t a2, const int8_t b2, const int8_t c2, const int8_t d2);
-static uint8_t mp4ff_atom_name_to_type(const int8_t a, const int8_t b, const int8_t c, const int8_t d);
-uint64_t mp4ff_atom_read_header(mp4ff_t *f, uint8_t *atom_type, uint8_t *header_size);
-static int32_t mp4ff_read_stsz(mp4ff_t *f);
-static int32_t mp4ff_read_esds(mp4ff_t *f);
-static int32_t mp4ff_read_mp4a(mp4ff_t *f);
-static int32_t mp4ff_read_stsd(mp4ff_t *f);
-static int32_t mp4ff_read_stsc(mp4ff_t *f);
-static int32_t mp4ff_read_stco(mp4ff_t *f);
-static int32_t mp4ff_read_stts(mp4ff_t *f);
-#ifdef USE_TAGGING
-static int32_t mp4ff_read_meta(mp4ff_t *f, const uint64_t size);
-#endif
-int32_t mp4ff_atom_read(mp4ff_t *f, const int32_t size, const uint8_t atom_type);
-
-/* mp4sample.c */
-static int32_t mp4ff_chunk_of_sample(const mp4ff_t *f, const int32_t track, const int32_t sample,
-                                     int32_t *chunk_sample, int32_t *chunk);
-static int32_t mp4ff_chunk_to_offset(const mp4ff_t *f, const int32_t track, const int32_t chunk);
-static int32_t mp4ff_sample_range_size(const mp4ff_t *f, const int32_t track,
-                                       const int32_t chunk_sample, const int32_t sample);
-static int32_t mp4ff_sample_to_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_audio_frame_size(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample);
-
-#ifdef USE_TAGGING
-/* mp4meta.c */
-static int32_t mp4ff_tag_add_field(mp4ff_metadata_t *tags, const char *item, const char *value);
-static int32_t mp4ff_tag_set_field(mp4ff_metadata_t *tags, const char *item, const char *value);
-static int32_t mp4ff_set_metadata_name(mp4ff_t *f, const uint8_t atom_type, char **name);
-static int32_t mp4ff_parse_tag(mp4ff_t *f, const uint8_t parent_atom_type, const int32_t size);
-static int32_t mp4ff_meta_find_by_name(const mp4ff_t *f, const char *item, char **value);
-int32_t mp4ff_parse_metadata(mp4ff_t *f, const int32_t size);
-int32_t mp4ff_tag_delete(mp4ff_metadata_t *tags);
-int32_t mp4ff_meta_get_num_items(const mp4ff_t *f);
-int32_t mp4ff_meta_get_by_index(const mp4ff_t *f, uint32_t index,
-                            char **item, char **value);
-int32_t mp4ff_meta_get_title(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_artist(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_writer(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_album(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_date(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_tool(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_comment(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_genre(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_track(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_disc(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_compilation(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_tempo(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value);
-#endif
-
-/* mp4ff.c */
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
-#ifdef USE_TAGGING
-mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f);
-#endif
-void mp4ff_close(mp4ff_t *ff);
-//void mp4ff_track_add(mp4ff_t *f);
-int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size,int meta_only);
-int32_t parse_atoms(mp4ff_t *f,int meta_only);
-
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int32_t track, const int32_t sample,
-                          uint8_t **audio_buffer,  uint32_t *bytes);
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int32_t track,
-                                 uint8_t** ppBuf, uint32_t* pBufSize);
-int32_t mp4ff_total_tracks(const mp4ff_t *f);
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int32_t track);
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int32_t track);
-
-uint32_t mp4ff_meta_genre_to_index(const char * genrestr);//returns 1-based index, 0 if not found
-const char * mp4ff_meta_index_to_genre(uint32_t idx);//returns pointer to static string
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/debian/tmp/usr/include/neaacdec.h b/debian/tmp/usr/include/neaacdec.h
deleted file mode 100644
index a45f1d0..0000000
--- a/debian/tmp/usr/include/neaacdec.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-**
-** $Id: neaacdec.h,v 1.13 2009/01/26 23:51:15 menno Exp $
-**/
-
-#ifndef __NEAACDEC_H__
-#define __NEAACDEC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#if 1
-/* MACROS FOR BACKWARDS COMPATIBILITY */
-/* structs */
-#define faacDecHandle                  NeAACDecHandle
-#define faacDecConfiguration           NeAACDecConfiguration
-#define faacDecConfigurationPtr        NeAACDecConfigurationPtr
-#define faacDecFrameInfo               NeAACDecFrameInfo
-/* functions */
-#define faacDecGetErrorMessage         NeAACDecGetErrorMessage
-#define faacDecSetConfiguration        NeAACDecSetConfiguration
-#define faacDecGetCurrentConfiguration NeAACDecGetCurrentConfiguration
-#define faacDecInit                    NeAACDecInit
-#define faacDecInit2                   NeAACDecInit2
-#define faacDecInitDRM                 NeAACDecInitDRM
-#define faacDecPostSeekReset           NeAACDecPostSeekReset
-#define faacDecOpen                    NeAACDecOpen
-#define faacDecClose                   NeAACDecClose
-#define faacDecDecode                  NeAACDecDecode
-#define AudioSpecificConfig            NeAACDecAudioSpecificConfig
-#endif
-
-
-#ifdef _WIN32
-  #pragma pack(push, 8)
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI __cdecl
-  #endif
-#else
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI
-  #endif
-#endif
-
-#define FAAD2_VERSION "2.7"
-
-/* object types for AAC */
-#define MAIN       1
-#define LC         2
-#define SSR        3
-#define LTP        4
-#define HE_AAC     5
-#define ER_LC     17
-#define ER_LTP    19
-#define LD        23
-#define DRM_ER_LC 27 /* special object type for DRM */
-
-/* header types */
-#define RAW        0
-#define ADIF       1
-#define ADTS       2
-#define LATM       3
-
-/* SBR signalling */
-#define NO_SBR           0
-#define SBR_UPSAMPLED    1
-#define SBR_DOWNSAMPLED  2
-#define NO_SBR_UPSAMPLED 3
-
-/* library output formats */
-#define FAAD_FMT_16BIT  1
-#define FAAD_FMT_24BIT  2
-#define FAAD_FMT_32BIT  3
-#define FAAD_FMT_FLOAT  4
-#define FAAD_FMT_FIXED  FAAD_FMT_FLOAT
-#define FAAD_FMT_DOUBLE 5
-
-/* Capabilities */
-#define LC_DEC_CAP           (1<<0) /* Can decode LC */
-#define MAIN_DEC_CAP         (1<<1) /* Can decode MAIN */
-#define LTP_DEC_CAP          (1<<2) /* Can decode LTP */
-#define LD_DEC_CAP           (1<<3) /* Can decode LD */
-#define ERROR_RESILIENCE_CAP (1<<4) /* Can decode ER */
-#define FIXED_POINT_CAP      (1<<5) /* Fixed point */
-
-/* Channel definitions */
-#define FRONT_CHANNEL_CENTER (1)
-#define FRONT_CHANNEL_LEFT   (2)
-#define FRONT_CHANNEL_RIGHT  (3)
-#define SIDE_CHANNEL_LEFT    (4)
-#define SIDE_CHANNEL_RIGHT   (5)
-#define BACK_CHANNEL_LEFT    (6)
-#define BACK_CHANNEL_RIGHT   (7)
-#define BACK_CHANNEL_CENTER  (8)
-#define LFE_CHANNEL          (9)
-#define UNKNOWN_CHANNEL      (0)
-
-/* DRM channel definitions */
-#define DRMCH_MONO          1
-#define DRMCH_STEREO        2
-#define DRMCH_SBR_MONO      3
-#define DRMCH_SBR_STEREO    4
-#define DRMCH_SBR_PS_STEREO 5
-
-
-/* A decode call can eat up to FAAD_MIN_STREAMSIZE bytes per decoded channel,
-   so at least so much bytes per channel should be available in this stream */
-#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */
-
-
-typedef void *NeAACDecHandle;
-
-typedef struct mp4AudioSpecificConfig
-{
-    /* Audio Specific Info */
-    unsigned char objectTypeIndex;
-    unsigned char samplingFrequencyIndex;
-    unsigned long samplingFrequency;
-    unsigned char channelsConfiguration;
-
-    /* GA Specific Info */
-    unsigned char frameLengthFlag;
-    unsigned char dependsOnCoreCoder;
-    unsigned short coreCoderDelay;
-    unsigned char extensionFlag;
-    unsigned char aacSectionDataResilienceFlag;
-    unsigned char aacScalefactorDataResilienceFlag;
-    unsigned char aacSpectralDataResilienceFlag;
-    unsigned char epConfig;
-
-    char sbr_present_flag;
-    char forceUpSampling;
-    char downSampledSBR;
-} mp4AudioSpecificConfig;
-
-typedef struct NeAACDecConfiguration
-{
-    unsigned char defObjectType;
-    unsigned long defSampleRate;
-    unsigned char outputFormat;
-    unsigned char downMatrix;
-    unsigned char useOldADTSFormat;
-    unsigned char dontUpSampleImplicitSBR;
-} NeAACDecConfiguration, *NeAACDecConfigurationPtr;
-
-typedef struct NeAACDecFrameInfo
-{
-    unsigned long bytesconsumed;
-    unsigned long samples;
-    unsigned char channels;
-    unsigned char error;
-    unsigned long samplerate;
-
-    /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */
-    unsigned char sbr;
-
-    /* MPEG-4 ObjectType */
-    unsigned char object_type;
-
-    /* AAC header type; MP4 will be signalled as RAW also */
-    unsigned char header_type;
-
-    /* multichannel configuration */
-    unsigned char num_front_channels;
-    unsigned char num_side_channels;
-    unsigned char num_back_channels;
-    unsigned char num_lfe_channels;
-    unsigned char channel_position[64];
-
-    /* PS: 0: off, 1: on */
-    unsigned char ps;
-} NeAACDecFrameInfo;
-
-char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode);
-
-unsigned long NEAACDECAPI NeAACDecGetCapabilities(void);
-
-NeAACDecHandle NEAACDECAPI NeAACDecOpen(void);
-
-NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder);
-
-unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder,
-                                                   NeAACDecConfigurationPtr config);
-
-/* Init the library based on info from the AAC file (ADTS/ADIF) */
-long NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder,
-                              unsigned char *buffer,
-                              unsigned long buffer_size,
-                              unsigned long *samplerate,
-                              unsigned char *channels);
-
-/* Init the library using a DecoderSpecificInfo */
-char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder,
-                               unsigned char *pBuffer,
-                               unsigned long SizeOfDecoderSpecificInfo,
-                               unsigned long *samplerate,
-                               unsigned char *channels);
-
-/* Init the library for DRM */
-char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hDecoder, unsigned long samplerate,
-                                 unsigned char channels);
-
-void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame);
-
-void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder);
-
-void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
-                                 NeAACDecFrameInfo *hInfo,
-                                 unsigned char *buffer,
-                                 unsigned long buffer_size);
-
-void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder,
-                                  NeAACDecFrameInfo *hInfo,
-                                  unsigned char *buffer,
-                                  unsigned long buffer_size,
-                                  void **sample_buffer,
-                                  unsigned long sample_buffer_size);
-
-char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer,
-                                             unsigned long buffer_size,
-                                             mp4AudioSpecificConfig *mp4ASC);
-
-#ifdef _WIN32
-  #pragma pack(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/debian/tmp/usr/lib/libfaad.a b/debian/tmp/usr/lib/libfaad.a
deleted file mode 100644
index 1a0d9b9..0000000
Binary files a/debian/tmp/usr/lib/libfaad.a and /dev/null differ
diff --git a/debian/tmp/usr/lib/libfaad.la b/debian/tmp/usr/lib/libfaad.la
deleted file mode 100755
index e725739..0000000
--- a/debian/tmp/usr/lib/libfaad.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libfaad.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-4
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libfaad.so.2'
-
-# Names of this library.
-library_names='libfaad.so.2.0.0 libfaad.so.2 libfaad.so'
-
-# The name of the static archive.
-old_library='libfaad.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -lm'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libfaad.
-current=2
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'
diff --git a/debian/tmp/usr/lib/libfaad.so b/debian/tmp/usr/lib/libfaad.so
deleted file mode 120000
index a95c965..0000000
--- a/debian/tmp/usr/lib/libfaad.so
+++ /dev/null
@@ -1 +0,0 @@
-libfaad.so.2.0.0
\ No newline at end of file
diff --git a/debian/tmp/usr/lib/libfaad.so.2 b/debian/tmp/usr/lib/libfaad.so.2
deleted file mode 120000
index a95c965..0000000
--- a/debian/tmp/usr/lib/libfaad.so.2
+++ /dev/null
@@ -1 +0,0 @@
-libfaad.so.2.0.0
\ No newline at end of file
diff --git a/debian/tmp/usr/lib/libfaad.so.2.0.0 b/debian/tmp/usr/lib/libfaad.so.2.0.0
deleted file mode 100755
index 4107114..0000000
Binary files a/debian/tmp/usr/lib/libfaad.so.2.0.0 and /dev/null differ
diff --git a/debian/tmp/usr/lib/libmp4ff.a b/debian/tmp/usr/lib/libmp4ff.a
deleted file mode 100644
index 6fd32aa..0000000
Binary files a/debian/tmp/usr/lib/libmp4ff.a and /dev/null differ
diff --git a/debian/tmp/usr/lib/libmp4ff.la b/debian/tmp/usr/lib/libmp4ff.la
deleted file mode 100755
index cf49fe9..0000000
--- a/debian/tmp/usr/lib/libmp4ff.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libmp4ff.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-4
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libmp4ff.so.0'
-
-# Names of this library.
-library_names='libmp4ff.so.0.0.0 libmp4ff.so.0 libmp4ff.so'
-
-# The name of the static archive.
-old_library='libmp4ff.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libmp4ff.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'
diff --git a/debian/tmp/usr/lib/libmp4ff.so b/debian/tmp/usr/lib/libmp4ff.so
deleted file mode 120000
index 459b975..0000000
--- a/debian/tmp/usr/lib/libmp4ff.so
+++ /dev/null
@@ -1 +0,0 @@
-libmp4ff.so.0.0.0
\ No newline at end of file
diff --git a/debian/tmp/usr/lib/libmp4ff.so.0 b/debian/tmp/usr/lib/libmp4ff.so.0
deleted file mode 120000
index 459b975..0000000
--- a/debian/tmp/usr/lib/libmp4ff.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libmp4ff.so.0.0.0
\ No newline at end of file
diff --git a/debian/tmp/usr/lib/libmp4ff.so.0.0.0 b/debian/tmp/usr/lib/libmp4ff.so.0.0.0
deleted file mode 100755
index 27ab988..0000000
Binary files a/debian/tmp/usr/lib/libmp4ff.so.0.0.0 and /dev/null differ
diff --git a/debian/tmp/usr/share/man/manm/faad.man b/debian/tmp/usr/share/man/manm/faad.man
deleted file mode 100644
index 96d4a29..0000000
--- a/debian/tmp/usr/share/man/manm/faad.man
+++ /dev/null
@@ -1,85 +0,0 @@
-.TH FAAD "1" "October 2006" "faad 2.5" ""
-.SH NAME
-faad \(em Process an Advanced Audio Codec stream
-
-.SH "SYNOPSIS"
-.B faad 
-[options] [\-w | \-o <output_filename> | \-a <output_filename>] input_filename
-
-.SH "DESCRIPTION"
-This utility provides a command line interface to libfaad2. This program reads in MPEG\(hy4 AAC files, processes, and outputs them in either Microsoft WAV, MPEG\(hy4 AAC ADTS, or standard PCM formats.
-
-.SH "OPTIONS"
-.TP
-.BI \-a " <filename>" ", \-\^\-adtsout" " <filename>"
-Sets the processing to output to the specified file in MPEG\(hy4 AAC ADTS format 
-.TP
-.BI \-b " <number>" ", \-\^\-bits" " <number>"
-Set the output (individual) sample format. The number takes one of the following values:
-.RS
-.RS
-1: 16\(hybit PCM data (default).
-.br
-2: 24\(hybit PCM data.
-.br
-3: 32\(hybit PCM data.
-.br
-4: 32\(hybit floating\(hypoint data.
-.br
-5: 64\(hybit floating\(hypoint data.
-.RE
-.RE
-.TP
-.B \-d ", \-\^\-downmix"
-Set the processing to downsample from 5.1 (surround sound and bass) channels to 2 channels (stereo). 
-.TP
-.BI \-f " <number>" ", \-\^\-format" " <number>"
-Set the output file format. The number takes one of the following values:
-.RS
-.RS
-1: Microsoft WAV format (default).
-.br
-2: Raw PCM data.
-.RE
-.RE
-.TP
-.BI \-g
-Set the processing to not perform gapless decoding.
-.TP
-.B \-h ", \-\^\-help"
-Shows a usage summary.
-.TP
-.B \-i ", \-\^\-info"
-Shows information about the about the input file.
-.TP
-.BI \-l " <number>" ", \-\^\-objecttype" " <number>"
-Sets the MPEG\hy(4 profile and object type for the processing to use. The number takes one of the following values:
-.RS
-.RS
-1: Main object type.
-.br
-2: Low Complexity (LC) object type (default).
-.br
-4: Long Term Prediction (LTP) object type.
-.br
-23: Low Delay (LD) object type.
-.RE
-.RE
-.TP
-.BI \-o " <filename>" ", \-\^\-outfile" " <number>"
-Sets the filename for processing output.
-.TP
-.B \-q ", \-\^\-quiet"
-Quiet \- Suppresses status messages during processing.
-.TP
-.B \-t ", \-\^\-oldformat"
-Sets the processing to use the old MPEG\(hy4 AAC ADTS format when outputting in said format.
-.TP
-.B \-w ", \-\^\-stdio"
-Sets the processing output to be sent to the standard out.
-
-.SH "AUTHOR"
-Matthew W. S. Bell <matthew (at) bells23.org.uk>
-
-.SH "SEE ALSO"
-\fBfaac\fP(1)
\ No newline at end of file

-- 
faad2 packaging



More information about the pkg-multimedia-commits mailing list