use ffmpeg release/1.2

kolyvan · Mar 18, 2013 · 7b77b0f · 7b77b0f
1 parent bc398e2
commit 7b77b0f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/FFmpeg b/FFmpeg
diff --git a/Rakefile b/Rakefile
@@ -15,7 +15,6 @@ GCC_PATH='/Developer/usr/bin/gcc'
 LIB_PATH='/usr/lib/system'
 PLATOFRM_PATH_SIM ='/iPhoneSimulator.platform'
 PLATOFRM_PATH_IOS ='/iPhoneOS.platform'
-#SDK_PATH_SIM ='/Developer/SDKs/iPhoneSimulator5.1.sdk'
 SDK_PATH_SIM ='/Developer/SDKs/iPhoneSimulator6.1.sdk'
 SDK_PATH_IOS='/Developer/SDKs/iPhoneOS6.1.sdk'
 
@@ -27,6 +26,7 @@ FFMPEG_BUILD_ARGS_SIM = [
 '--cpu=i386',
 "--extra-ldflags='-arch i386'",
 "--extra-cflags='-arch i386'",
+'--disable-asm',
 ]
 
 FFMPEG_BUILD_ARGS_ARMV7 = [
@@ -37,12 +37,12 @@ FFMPEG_BUILD_ARGS_ARMV7 = [
 "--extra-ldflags='-arch armv7'",
 "--extra-cflags='-mfpu=neon -mfloat-abi=softfp -mvectorize-with-neon-quad'",
 '--enable-neon',
-'--disable-debug',
 '--enable-optimizations',
+'--disable-debug',
 '--disable-armv5te',
 '--disable-armv6',
 '--disable-armv6t2',
-'--disable-armvfp',
+'--enable-small',
 ]
 
 FFMPEG_BUILD_ARGS_ARMV7S = [
@@ -53,16 +53,15 @@ FFMPEG_BUILD_ARGS_ARMV7S = [
 "--extra-ldflags='-arch armv7s'",
 "--extra-cflags='-mfpu=neon -mfloat-abi=softfp -mvectorize-with-neon-quad'",
 '--enable-neon',
-'--disable-debug',
 '--enable-optimizations',
+'--disable-debug',
 '--disable-armv5te',
 '--disable-armv6',
 '--disable-armv6t2',
-'--disable-armvfp',
+'--enable-small',
 ]
 
 FFMPEG_BUILD_ARGS = [
-#'--disable-asm',
 '--disable-ffmpeg',
 '--disable-ffplay',
 '--disable-ffserver',
@@ -78,7 +77,6 @@ FFMPEG_BUILD_ARGS = [
 
 FFMPEG_LIBS = [
 'libavcodec',
-#'libavdevice',
 'libavformat',
 'libavutil',
 'libswscale',

diff --git a/kxmovie.xcodeproj/project.pbxproj b/kxmovie.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		8704657C16F6ECA000D4083E /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8704657A16F6EC9100D4083E /* libiconv.dylib */; };
 		87E793FD16390F6D000A0848 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87E793FC16390F6D000A0848 /* UIKit.framework */; };
 		87E793FF16390F6D000A0848 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87E793FE16390F6D000A0848 /* Foundation.framework */; };
 		87E7940116390F6D000A0848 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87E7940016390F6D000A0848 /* CoreGraphics.framework */; };
@@ -61,6 +62,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		8704657A16F6EC9100D4083E /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/usr/lib/libiconv.dylib; sourceTree = DEVELOPER_DIR; };
 		87E793F816390F6D000A0848 /* KxMovieExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KxMovieExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		87E793FC16390F6D000A0848 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		87E793FE16390F6D000A0848 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
@@ -106,6 +108,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8704657C16F6ECA000D4083E /* libiconv.dylib in Frameworks */,
 				87E7945116391BC1000A0848 /* libz.dylib in Frameworks */,
 				87E7944A16391B9E000A0848 /* libavcodec.a in Frameworks */,
 				87E7944C16391B9E000A0848 /* libavformat.a in Frameworks */,
@@ -164,6 +167,7 @@
 		87E793FB16390F6D000A0848 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				8704657A16F6EC9100D4083E /* libiconv.dylib */,
 				87E7944416391B9E000A0848 /* libavcodec.a */,
 				87E7944616391B9E000A0848 /* libavformat.a */,
 				87E7944716391B9E000A0848 /* libavutil.a */,