--- a/src/faac.mk	Wed Dec 08 00:54:47 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
-
-# faac
-PKG             := faac
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.28
-$(PKG)_CHECKSUM := d00b023a3642f81bb1fb13d962a65079121396ee
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://www.audiocoding.com/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-src/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc faad2
-
-define $(PKG)_UPDATE
-    wget -q -O- 'http://sourceforge.net/projects/faac/files/faac-src/' | \
-    $(SED) -n 's,.*/faac-\([0-9][^"]*\)/".*,\1,p' | \
-    head -1
-endef
-
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
-        --without-mp4v2
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
-endef

--- a/src/ffmpeg.mk	Wed Dec 08 00:54:47 2010 +0100
+++ b/src/ffmpeg.mk	Wed Dec 08 01:35:40 2010 +0100
@@ -11,7 +11,7 @@
 $(PKG)_WEBSITE  := http://www.ffmpeg.org/
 $(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc bzip2 faad2 faac lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
+$(PKG)_DEPS     := gcc bzip2 faad2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://www.ffmpeg.org/download.html' | \
@@ -40,7 +40,7 @@
         --enable-libmp3lame \
         --enable-libxvid \
         --enable-libfaad \
-        --enable-libfaac \
+        --disable-libfaac \
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
         --enable-libx264 \