Merge pull request #17 from aarnaud/master

FFmpeg 2.1 and full static. Thanks @aarnaud !

Author: zimbatm

README.md

@@ -10,7 +10,7 @@ Build dependencies
 ------------------
 
     # Debian & Ubuntu
-    $ apt-get install build-essential curl tar <FIXME???>
+    $ apt-get install build-essential curl tar
 
 	# OS X
 	# install XCode, it can be found at http://developer.apple.com/
@@ -20,7 +20,7 @@ Build dependencies
 Build & "install"
 -----------------
 
-    $ ./build.sh
+    $ ./build.sh or build-ubuntu.sh
     # ... wait ...
     # binaries can be found in ./target/bin/
 
@@ -49,13 +49,8 @@ I'm not sure it's a good idea to statically link those, but it probably
 means the executable won't work across distributions or even across releases.
 
     # On Ubuntu 10.04:
-    $ ldd build/bin/ffmpeg
-	linux-gate.so.1 =>  (0xb78df000)
-	libm.so.6 => /lib/tls/i686/cmov/libm.so.6 (0xb789f000)
-	libz.so.1 => /lib/libz.so.1 (0xb788a000)
-	libpthread.so.0 => /lib/tls/i686/cmov/libpthread.so.0 (0xb7870000)
-	libc.so.6 => /lib/tls/i686/cmov/libc.so.6 (0xb7716000)
-	/lib/ld-linux.so.2 (0xb78e0000)
+    $ ldd ./target/bin/ffmpeg 
+	not a dynamic executable
 
     # on OSX 10.6.4:
     $ otool -L ffmpeg 

build-ubuntu.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo apt-get install build-essential curl tar
+
+./build.sh

build.sh

@@ -4,7 +4,7 @@ set -e
 set -u
 
 jflag=
-jval=4
+jval=2
 
 while getopts 'j:' OPTION
 do
@@ -51,7 +51,7 @@ cd $BUILD_DIR
 ../fetchurl "ftp://ftp.videolan.org/pub/x264/snapshots/last_x264.tar.bz2"
 ../fetchurl "http://downloads.xvid.org/downloads/xvidcore-1.3.2.tar.gz"
 ../fetchurl "http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz"
-../fetchurl "http://ffmpeg.org/releases/ffmpeg-2.0.tar.bz2"
+../fetchurl "http://www.ffmpeg.org/releases/ffmpeg-2.1.tar.bz2"
 
 echo "*** Building yasm ***"
 cd $BUILD_DIR/yasm*
@@ -126,5 +126,5 @@ rm -f "$TARGET_DIR/lib/*.so"
 # FFMpeg
 echo "*** Building FFmpeg ***"
 cd $BUILD_DIR/ffmpeg*
-CFLAGS="-I$TARGET_DIR/include" LDFLAGS="-L$TARGET_DIR/lib -lm" ./configure --prefix=${OUTPUT_DIR:-$TARGET_DIR} --extra-version=static --disable-debug --disable-shared --enable-static --extra-cflags=--static --disable-ffplay --disable-ffserver --disable-doc --enable-gpl --enable-pthreads --enable-postproc --enable-gray --enable-runtime-cpudetect --enable-libfaac --enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264 --enable-libxvid --enable-bzlib --enable-zlib --enable-nonfree --enable-version3 --enable-libvpx --disable-devices
+CFLAGS="-I$TARGET_DIR/include" LDFLAGS="-L$TARGET_DIR/lib -lm" ./configure --prefix=${OUTPUT_DIR:-$TARGET_DIR} --extra-cflags="-I$TARGET_DIR/include -static" --extra-ldflags="-L$TARGET_DIR/lib -lm -static" --extra-version=static --disable-debug --disable-shared --enable-static --extra-cflags=--static --disable-ffplay --disable-ffserver --disable-doc --enable-gpl --enable-pthreads --enable-postproc --enable-gray --enable-runtime-cpudetect --enable-libfaac --enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264 --enable-libxvid --enable-bzlib --enable-zlib --enable-nonfree --enable-version3 --enable-libvpx --disable-devices
 make -j $jval && make install