* Merge with ubuntu: * debian/control: - update maintainer and uploaders - use our addresses in Vcs-* fields - build-depends on libfaac-dev, libopencore-amrnb-dev and libopencore-amrwb-dev to add aac encoding and amr support (LP: #490227) - recommends apport-hooks-medibuntu for lib*-extra-* to catch all bug reports. * debian/confflags: - explicitly enable AMR-NB and AMR-WB support with --enable-libopencore-amrnb, --enable-libopencore-amrwb and --enable-version3 * No-change rebuild to pick libvpx's new shlib. (LP: #926580) * Properly set the library paths for multiarch and shared libs in debian/*.install instead of using brace expansion and asterisks. * Fix debian/*.install file generation on archs (e.g. armel) that build more than only one optimized shared library (Closes: #656184). * Add breaks on old mplayer versions (Closes: #657326) * extend package description to include a note what libav actually is * Urgency medium because new upstream releases fixes security issues * Rebuild against libav 0.8 * Tighten build dependency on libav-source (>= 0.8-1~) * Enable drawtext filter (Closes: #647132) * fix build failures by dropping unnecessary configure flags * bump shlibs version * rename the package 'ffmpeg' -> 'libav' * Rename package libav to libav-tools (Closes: #654984) * bump dependency on libav-source * don't try to install CREDITS and TODO files * Rebuild against libav 0.7.3 * Tighten build dependency on libav-source (>= 4:0.7.3-2) * Bump shlibs (technically unnecessary, but added for completeness)