Commit ba55d80

Changbeom AhnChangbeom Ahn

Changbeom Ahn

authored and

Changbeom Ahn

committed

updated for FFmpeg 4.0.3

1 parent 321807a commit ba55d80Copy full SHA for ba55d80

File tree

-10

lines changed

-10

lines changed

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ This is a shell script to build FFmpeg libraries for iOS and tvOS apps.`
`6`	`6`
`7`	`7`	`Tested with:`
`8`	`8`
`9`		`-* FFmpeg 3.4`
`10`		`-* Xcode 9`
	`9`	`+* FFmpeg 4.0.3`
	`10`	`+* Xcode 10.1`
`11`	`11`
`12`	`12`	`## Requirements`
`13`	`13`
`@@ -36,7 +36,7 @@ Use build-ffmpeg-tvos.sh for tvOS.`
`36`	`36`
`37`	`37`	`## Download`
`38`	`38`
`39`		`-You can download a binary for FFmpeg 3.4 release at https://downloads.sourceforge.net/project/ffmpeg-ios/ffmpeg-ios-master.tar.bz2`
	`39`	`+You can download a binary for FFmpeg 4.0.3 release at https://downloads.sourceforge.net/project/ffmpeg-ios/ffmpeg-ios-master.tar.bz2`
`40`	`40`
`41`	`41`	`## External libraries`
`42`	`42`
`@@ -45,7 +45,3 @@ You should link your app with`
`45`	`45`	`* libz.dylib`
`46`	`46`	`* libbz2.dylib`
`47`	`47`	`* libiconv.dylib`
`48`		`-`
`49`		`-## Influences`
`50`		`-`
`51`		`-* https://github.com/bbcallen/ijkplayer/blob/fc70895c64cbbd20f32f1d81d2d48609ed13f597/ios/tools/do-compile-ffmpeg.sh#L7`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`	`3`	`# directories`
`4`		`-FF_VERSION="3.4"`
	`4`	`+FF_VERSION="4.0.3"`
	`5`	`+#FF_VERSION="snapshot-git"`
`5`	`6`	`if [[ $FFMPEG_VERSION != "" ]]; then`
`6`	`7`	`FF_VERSION=$FFMPEG_VERSION`
`7`	`8`	`fi`
`@@ -38,7 +39,7 @@ ARCHS="arm64 armv7 x86_64 i386"`
`38`	`39`	`COMPILE="y"`
`39`	`40`	`LIPO="y"`
`40`	`41`
`41`		`-DEPLOYMENT_TARGET="6.0"`
	`42`	`+DEPLOYMENT_TARGET="8.0"`
`42`	`43`
`43`	`44`	`if [ "$*" ]`
`44`	`45`	`then`
`@@ -115,7 +116,8 @@ then`
`115`	`116`	`then`
`116`	`117`	`AS="gas-preprocessor.pl -arch aarch64 -- $CC"`
`117`	`118`	`else`
`118`		`- AS="$CC"`
	`119`	`+ #AS="$CC"`
	`120`	`+ AS="gas-preprocessor.pl $CC"`
`119`	`121`	`fi`
`120`	`122`
`121`	`123`	`CXXFLAGS="$CFLAGS"`

Comments

(0)