3.4.2封版

Author: lzj

3.4.2/FFmpeg-iOS/include/libavutil/avconfig.h

@@ -2,5 +2,5 @@
 #ifndef AVUTIL_AVCONFIG_H
 #define AVUTIL_AVCONFIG_H
 #define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
+#define AV_HAVE_FAST_UNALIGNED 0
 #endif /* AVUTIL_AVCONFIG_H */

3.4.2/build-fdk-aac-iOS.sh

@@ -3,7 +3,7 @@
 
 CONFIGURE_FLAGS="--enable-static --with-pic=yes --disable-shared"
 
-ARCHS="arm64 x86_64 i386 armv7 armv7s"
+ARCHS="arm64 armv7 x86_64 i386"
 
 # directories
 SOURCE="fdk-aac-0.1.6"

3.4.2/build-ffmpeg-iOS.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-#armv7xcode9.1,
+#armv7 xcode9.1,
 #sudo xcode-select -switch pathToXcode9.1/Contents/Developer
 #xcode-select --print-path
 
@@ -12,19 +12,20 @@ SOURCE="ffmpeg-$FF_VERSION"
 #输出路径
 FAT="FFmpeg-iOS"
 
-SCRATCH=`pwd`/"scratch"
-THIN=`pwd`/"thin"
+SCRATCH=`pwd`/"scratch-ffmpeg"
+THIN=`pwd`/"thin-ffmpeg"
 #编译之前需要删除临时缓存文件夹，防止和之前编译的或fdk-aac冲突
 rm -rf "$SCRATCH"
 rm -rf "$THIN"
+rm -rf "$FAT"
+rm -rf "ffbuild"
 
 X264=`pwd`/x264-iOS         #H.264编码器
+OPENCORE_AMR=`pwd`/opencore-amr-iOS
 #FDK_AAC=`pwd`/fdk-aac-ios   #AAC第三方解码库
 #FREETYPE=`pwd`/freetype-iOS  #字体引擎库
-#FREETYPE=`pwd`/freetype-iOS  #opencore-amr-0.1.5
-OPENCORE_AMR=`pwd`/opencore-amr-iOS
 
-CONFIGURE_FLAGS="--enable-cross-compile --disable-debug --disable-programs --disable-ffplay --disable-doc --enable-pic --enable-static --disable-shared --disable-asm"
+CONFIGURE_FLAGS="--enable-cross-compile --disable-stripping --disable-debug --disable-programs --disable-ffplay --disable-doc --enable-pic --enable-static --disable-shared --disable-asm"
 
 CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-encoders --disable-decoders \
 --enable-demuxers --disable-muxers --disable-parsers --disable-filters \
@@ -54,7 +55,7 @@ then
     CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-version3 --enable-libopencore-amrnb --enable-libopencore-amrwb"
 fi
 
-ARCHS="armv7 armv7s arm64 x86_64"
+ARCHS="arm64 armv7 armv7s x86_64 i386"
 #ARCHS="arm64"
 
 COMPILE="y"
@@ -158,6 +159,7 @@ then
         then
             CFLAGS="$CFLAGS -I$OPENCORE_AMR/include"
             LDFLAGS="$LDFLAGS -L$OPENCORE_AMR/lib"
+            echo "$LDFLAGS"
         fi
 
 		TMPDIR=${TMPDIR/%\/} $CWD/$SOURCE/configure \

3.4.2/build-opencore-amr-iOS.sh

@@ -9,9 +9,10 @@ DEST="${CURRENTPATH}/${LIBSRCNAME}-iOS"
 mkdir -p $DEST
 
 DEVELOPER=`xcode-select -print-path`
-ARCHS="i386 x86_64 armv7 armv7s arm64"
+ARCHS="arm64 armv7 armv7s x86_64 i386"
 LIBS="libopencore-amrnb.a libopencore-amrwb.a"
 
+rm -rf "$DEST"
 tar zxvf ${LIBSRCNAME}-${VERSION}.tar.gz -C "${CURRENTPATH}"
 cd "${CURRENTPATH}/${LIBSRCNAME}-${VERSION}"
 

3.4.2/build-x264-iOS.sh

@@ -4,7 +4,8 @@
 
 CONFIGURE_FLAGS="--enable-static --enable-pic --disable-cli"
 
-ARCHS="arm64 x86_64 i386 armv7 armv7s"
+ARCHS="arm64 armv7 armv7s x86_64 i386"
+#ARCHS="arm64"
 
 # directories
 SOURCE="x264"
@@ -17,6 +18,10 @@ THIN=`pwd`/"thin-x264"
 COMPILE="y"
 LIPO="y"
 
+rm -rf "$SCRATCH"
+rm -rf "$THIN"
+rm -rf "$FAT"
+
 if [ "$*" ]
 then
 	if [ "$*" = "lipo" ]
@@ -42,7 +47,7 @@ then
 		mkdir -p "$SCRATCH/$ARCH"
 		cd "$SCRATCH/$ARCH"
 		CFLAGS="-arch $ARCH"
-                ASFLAGS=
+        ASFLAGS=""
 
 		if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]
 		then
@@ -61,13 +66,13 @@ then
 		    if [ $ARCH = "arm64" ]
 		    then
 		        HOST="--host=aarch64-apple-darwin"
-			XARCH="-arch aarch64"
+                XARCH="-arch aarch64"
 		    else
 		        HOST="--host=arm-apple-darwin"
-			XARCH="-arch arm"
+                XARCH="-arch arm"
 		    fi
-                    CFLAGS="$CFLAGS -mios-version-min=8.0 -fembed-bitcode"
-                    ASFLAGS="$CFLAGS"
+                CFLAGS="$CFLAGS -mios-version-min=8.0 -fembed-bitcode"
+                ASFLAGS="$CFLAGS"
 		fi
 
 		XCRUN_SDK=`echo $PLATFORM | tr '[:upper:]' '[:lower:]'`
@@ -109,4 +114,7 @@ then
 
 	cd $CWD
 	cp -rf $THIN/$1/include $FAT
+    rm -rf $SCRATCH
+    rm -rf $THIN
+    echo "building fat binaries successed"
 fi