Add new BSD license

.gitignore

@@ -1,3 +1,4 @@
+FFmpeg-iOS*
 scratch*
 thin*
 fat*

.sf

@@ -0,0 +1,15 @@
+U2FsdGVkX1963CBvqs0HeUSGVyB5D9h3ZGt59hEumxSseCqcFaPYkWuVfH2Z7AAp
+IKSrSFVBJyjmOFCp0atyz43YHXRfNyxRr3+Y7fKAyTnkEnI+XZVl9GLCLAndeyiX
+76V9+YomXl8VXJF7GJoa/37HMbFJ2XniDCsxsPuQm51lkhRUDqU9/g91x3WcQgWN
+TpJv1YFg8tL1Dsf82b+zvQ+VhDcbTOcB+BKhHe+MYyR7p13caN20j7hbzvxGXFsV
+tjugHZuIhg8EbrDdSP0vAhqgKt7NoW3Enino54/EVjX8VysuP4B3Z9Hi24dWccJf
+9WxsTkoaAFPCPXkv5GZ95W73p41G1zPFh5kOHwnli7Kvb6IKSQq/yrfTf5SOTUox
+85JAYk3pCPqVSA/v5i6z1e11382jdAszNA8+B916gjK84YRFAkYB40Y+BHvsrqHW
+9XL0o6u0BZmUkx+hx78IrwmIewqbq2+6lU+vOTFWevl1pYHQIm8x3IwazM275zu/
+e4Rth3sDGiELASjW+LZs2+PwchL7uyxGmlF/YuHJDePWWEl18Hk8lVBebjiY1DqA
+ZpaC9VdHpuioK5JxBcZktqw18hVR8hkVQpJUT0PokkEsEf2+oeymY6LgFbnIrO8/
+SwBgqjHHRKwbzrLok3cRUiC+gxNWjHi+x+W/QVG4l4On/bsCT/EAxiF+Q+p1U7OC
+4YkxNF7A2l1PcNk+PAhy4VyHfOtidcGeRomHj5DiS98QQJCLUaVE4kmVrF1wDYlO
+pc9qKtyvhFGz/eEpXmLV9gzHD3S7pKdBU0NAU8wVeeaGOGyX9ISpztQlvEWlPyEQ
+ke4M+Pj1CfOQxFc5rX6EoztI+qHogEUcBD9FBYtFswBAcSG9kYhIuORR44LPB6yF
+m98e+PfyXGVLGI5GFNV1Sw==

.travis.yml

@@ -0,0 +1,16 @@
+language: objective-c
+
+script: ./build-ffmpeg.sh 2>.stderr
+
+env:
+    global:
+        - secure: "POoeB0wNaIPKORu8solBfDwSbgk6bsxSJpVWqVawledYiZHnYLXUDzDawoKOXzjJ1oQQiluZWCmv+RXDA9gthTNrH08fuUEvsUHBr7sgHqaOskEbKN/s2962FLy4FRZdQyZFkrrzNcqnc3xaxgF5ZyjRewtB0JioaOSAPEH8ALc="
+        - TARBALL=ffmpeg-ios-$TRAVIS_BRANCH.tar.bz2
+
+after_success:
+    - tar cjf $TARBALL FFmpeg-iOS .stderr scratch/*/config.log ffmpeg*/LICENSE.md ffmpeg*/COPYING.* README.md
+    - openssl aes-256-cbc -k "$secret" -in .sf -d -a -out id_sf
+    - chmod 600 id_sf
+    - scp -i id_sf -o 'StrictHostKeyChecking no' $TARBALL koolbear@frs.sourceforge.net:/home/frs/project/ffmpeg-ios
+
+after_failure: cat .stderr

LICENSE

@@ -0,0 +1,10 @@
+Copyright (c) 2013, kewlbear
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,15 +1,20 @@
-FFmpeg iOS build script
-=======================
+# FFmpeg iOS build script
+
+[![Build Status](https://travis-ci.org/kewlbear/FFmpeg-iOS-build-script.svg?branch=master)](https://travis-ci.org/kewlbear/FFmpeg-iOS-build-script)
 
 This is a shell script to build FFmpeg libraries for iOS apps.
 
 Tested with:
 
-* FFmpeg N-56578-g3cfd4df
-* Xcode 5
+* FFmpeg 2.6
+* Xcode 6
+
+## Requirements
+
+* https://github.com/libav/gas-preprocessor
+* yasm 1.2.0
 
-Usage
------
+## Usage
 
 * To build everything:
 
@@ -26,3 +31,21 @@ Usage
 * To build fat libraries from separately built thin libraries:
 
         ./build-ffmpeg.sh lipo
+
+## Download
+
+You can download a binary for FFmpeg 2.6 release at https://downloads.sourceforge.net/project/ffmpeg-ios/ffmpeg-ios-master.tar.bz2
+
+## External libraries
+
+You should link your app with
+
+* libz.dylib
+* libbz2.dylib
+* libiconv.dylib
+
+## Influences
+
+* https://github.com/bbcallen/ijkplayer/blob/fc70895c64cbbd20f32f1d81d2d48609ed13f597/ios/tools/do-compile-ffmpeg.sh#L7
+
+<a href="http://area51.stackexchange.com/proposals/68765/stack-overflow-in-korean?referrer=TlX13ZoocJzZSF-vpU0x_w2"><img src="https://area51.stackexchange.com/ads/proposal/68765.png" width="220" height="250" alt="Stack Exchange Q&A site proposal: Stack Overflow (in Korean)" /></a>

build-ffmpeg.sh

@@ -1,30 +1,35 @@
 #!/bin/sh
 
 # directories
-SOURCE="ffmpeg"
-FAT="fat"
+SOURCE="ffmpeg-2.6"
+FAT="FFmpeg-iOS"
 
 SCRATCH="scratch"
 # must be an absolute path
 THIN=`pwd`/"thin"
 
 # absolute path to x264 library
-#X264=`pwd`/fat_x264
+#X264=`pwd`/fat-x264
 
-CONFIGURE_FLAGS="--enable-cross-compile --disable-debug --disable-ffmpeg \
-                 --disable-ffplay --disable-ffprobe --disable-ffserver \
-                 --disable-doc --disable-encoders --disable-muxers \
-                 --disable-bsfs --disable-devices --disable-filters --enable-pic"
+#FDK_AAC=`pwd`/fdk-aac/fdk-aac-ios
+
+CONFIGURE_FLAGS="--enable-cross-compile --disable-debug --disable-programs \
+                 --disable-doc --enable-pic"
 
 if [ "$X264" ]
 then
 	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-gpl --enable-libx264"
 fi
 
+if [ "$FDK_AAC" ]
+then
+	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-libfdk-aac"
+fi
+
 # avresample
 #CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-avresample"
 
-ARCHS="arm64 armv7s x86_64 i386 armv7"
+ARCHS="arm64 armv7s armv7 x86_64 i386"
 
 COMPILE="y"
 LIPO="y"
@@ -49,6 +54,34 @@ fi
 
 if [ "$COMPILE" ]
 then
+	if [ ! `which yasm` ]
+	then
+		echo 'Yasm not found'
+		if [ ! `which brew` ]
+		then
+			echo 'Homebrew not found. Trying to install...'
+			ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" \
+				|| exit 1
+		fi
+		echo 'Trying to install Yasm...'
+		brew install yasm || exit 1
+	fi
+	if [ ! `which gas-preprocessor.pl` ]
+	then
+		echo 'gas-preprocessor.pl not found. Trying to install...'
+		(curl -L https://github.com/libav/gas-preprocessor/raw/master/gas-preprocessor.pl \
+			-o /usr/local/bin/gas-preprocessor.pl \
+			&& chmod +x /usr/local/bin/gas-preprocessor.pl) \
+			|| exit 1
+	fi
+
+	if [ ! -r $SOURCE ]
+	then
+		echo 'FFmpeg source not found. Trying to download...'
+		curl http://www.ffmpeg.org/releases/$SOURCE.tar.bz2 | tar xj \
+			|| exit 1
+	fi
+
 	CWD=`pwd`
 	for ARCH in $ARCHS
 	do
@@ -79,18 +112,24 @@ then
 			CFLAGS="$CFLAGS -I$X264/include"
 			LDFLAGS="$LDFLAGS -L$X264/lib"
 		fi
+		if [ "$FDK_AAC" ]
+		then
+			CFLAGS="$CFLAGS -I$FDK_AAC/include"
+			LDFLAGS="$LDFLAGS -L$FDK_AAC/lib"
+		fi
 
-		$CWD/$SOURCE/configure \
+		TMPDIR=${TMPDIR/%\/} $CWD/$SOURCE/configure \
 		    --target-os=darwin \
 		    --arch=$ARCH \
 		    --cc="$CC" \
 		    $CONFIGURE_FLAGS \
 		    --extra-cflags="$CFLAGS" \
 		    --extra-cxxflags="$CXXFLAGS" \
 		    --extra-ldflags="$LDFLAGS" \
-		    --prefix="$THIN/$ARCH"
+		    --prefix="$THIN/$ARCH" \
+		|| exit 1
 
-		make -j3 install $EXPORT
+		make -j3 install $EXPORT || exit 1
 		cd $CWD
 	done
 fi
@@ -105,9 +144,12 @@ then
 	for LIB in *.a
 	do
 		cd $CWD
-		lipo -create `find $THIN -name $LIB` -output $FAT/lib/$LIB
+		echo lipo -create `find $THIN -name $LIB` -output $FAT/lib/$LIB 1>&2
+		lipo -create `find $THIN -name $LIB` -output $FAT/lib/$LIB || exit 1
 	done
 
 	cd $CWD
 	cp -rf $THIN/$1/include $FAT
 fi
+
+echo Done

ffmpeg-2.6/.gitattributes

@@ -0,0 +1 @@
+*.pnm -diff -text