1 files changed, 23 insertions, 17 deletions
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 6b6f51f..c2094c1 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -3,17 +3,19 @@
 
 PKG             := ffmpeg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.1
-$(PKG)_CHECKSUM := 930e5612d75d04fdf7c0579f4d85d47e31e38945
+$(PKG)_VERSION  := 2.1.1
+$(PKG)_CHECKSUM := e7a5b2d7f702c4e9ca69e23c6d3527f93de0d1bd
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(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 lame libvpx opencore-amr opus sdl speex theora vorbis x264 xvidcore zlib
+$(PKG)_DEPS     := gcc bzip2 lame libass libvpx opencore-amr opus sdl speex theora vo-aacenc vo-amrwbenc vorbis x264 xvidcore zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \
     $(SED) -n 's,.*ffmpeg-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    grep 2.* | \
+    $(SORT) -Vr | \
     head -1
 endef
 
@@ -25,30 +27,34 @@ define $(PKG)_BUILD
         --arch=$(patsubst -%,,$(TARGET)) \
         --target-os=mingw32 \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(if $(BUILD_STATIC), \
+            --enable-static --disable-shared , \
+            --disable-static --enable-shared ) \
         --disable-debug \
-        --disable-doc \
         --enable-memalign-hack \
+        --disable-pthreads \
+        --enable-w32threads \
+        --disable-doc \
         --enable-gpl \
         --enable-version3 \
         --disable-nonfree \
-        --enable-postproc \
-        --disable-pthreads \
-        --enable-w32threads \
         --enable-avisynth \
-        --enable-libspeex \
-        --enable-libtheora \
-        --enable-libvorbis \
-        --enable-libmp3lame \
-        --enable-libxvid \
+        --enable-libass \
         --disable-libfaac \
+        --enable-libmp3lame \
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
-        --enable-libx264 \
+        --enable-libopus \
+        --enable-libspeex \
+        --enable-libtheora \
+        --enable-libvo-aacenc \
+        --enable-libvo-amrwbenc \
+        --enable-libvorbis \
         --enable-libvpx \
-        --enable-libopus
+        --enable-libx264 \
+        --enable-libxvid \
+        --enable-postproc \
+        --enable-avresample
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 endef
-
-$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst enable-libxvid,disable-libxvid,$($(PKG)_BUILD))