--- PKGBUILD.orig	2013-04-11 14:50:58.000000000 -0400
+++ PKGBUILD	2013-04-23 16:05:19.365950613 -0400
@@ -10,13 +10,13 @@
 
 pkgname=ffmpeg-full
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Record, convert, and stream audio and video (all codecs; compatible to extra/ffmpeg)"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
 license=('GPL' 'custom:UNREDISTRIBUTABLE')
-depends=('faac' 'lame' 'libtheora' 'libva' 'sdl' 'x264' 'libass' 'libbluray' 'libcaca' 'libiec61883' 'openal' 'twolame' 'libavc1394' 'xvidcore' 'schroedinger' 'v4l-utils' 'speex' 'opus' 'libvpx' 'jack' 'opencore-amr' 'rtmpdump' 'openjpeg' 'libmodplug' 'gsm' 'libpulse' 'vo-aacenc' 'vo-amrwbenc' 'celt' 'gnutls' 'libdc1394' 'libfdk-aac' 'libcdio-paranoia')
+depends=('faac' 'lame' 'libtheora' 'libva' 'sdl' 'x264' 'libass' 'libbluray' 'libcaca' 'libiec61883' 'openal' 'twolame' 'libavc1394' 'xvidcore' 'schroedinger' 'v4l-utils' 'speex' 'opus' 'libvpx' 'jack' 'opencore-amr' 'rtmpdump' 'openjpeg' 'libmodplug' 'gsm' 'libpulse' 'vo-aacenc' 'vo-amrwbenc' 'celt' 'gnutls' 'libdc1394' 'libfdk-aac' 'libcdio-paranoia' 'libaacplus')
 makedepends=('libvdpau' 'yasm' 'pkg-config')
 conflicts=('ffmpeg' 'ffmpeg-git' 'ffmpeg-full-git')
 provides=('ffmpeg' 'qt-faststart')
@@ -40,6 +40,7 @@
     --enable-gnutls \
     --enable-gpl \
     --enable-iconv \
+    --enable-libaacplus \
     --enable-libass \
     --enable-libbluray \
     --enable-libcaca \
@@ -116,7 +117,6 @@
 # --enable-small               # we want SPEED instead
 # # this stuff does not build:
 # --enable-frei0r              # circular dependency
-# --enable-libaacplus          # does not build from AUR: configure.ac:8: error: "AM_CONFIG_HEADER": this macro is obsolete.
 # --enable-libflite            # configure fail: /usr/lib/gcc/x86_64-unknown-linux-gnu/4.7.2/../../../../lib/libflite.a(au_alsa.o): In function "audio_open_alsa": (.text+0x20): undefined reference to "snd_pcm_hw_params_sizeof"
 # --enable-libilbc             # configure fail: /tmp/ffconf.lccg5Ux6.c:1:18: fatal error: ilbc.h: No such file or directory
 # --enable-libnut              # link fail: /usr/bin/ld: /usr/lib/gcc/x86_64-unknown-linux-gnu/4.7.2/../../../../lib/libnut.a(muxer.o): relocation R_X86_64_32S against ".rodata" can not be used when making a shared object; recompile with -fPIC