Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit dbb4e81

Browse filesBrowse files
committed
Merge branch 'master' of https://github.com/markus-perl/ffmpeg-build-script into freetype
2 parents eee1a71 + 2664123 commit dbb4e81
Copy full SHA for dbb4e81

File tree

Expand file treeCollapse file tree

2 files changed

+6
-9
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+6
-9
lines changed

‎README.md

Copy file name to clipboardExpand all lines: README.md
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ Contact
7878
-------
7979

8080
* Github: [http://www.github.com/markus-perl](http://www.github.com/markus-perl)
81-
* E-Mail: markus (at) www-factory.de
8281

8382

8483
Tested on

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+6-8Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# https://github.com/markus-perl/ffmpeg-build-script
44

5-
VERSION=0.7
5+
VERSION=0.8
66
CWD=$(pwd)
77
PACKAGES="$CWD/packages"
88
WORKSPACE="$CWD/workspace"
@@ -78,7 +78,6 @@ execute () {
7878
$@
7979
fi
8080

81-
8281
if [ $? -ne 0 ]; then
8382
echo "$OUTPUT"
8483
echo ""
@@ -172,8 +171,8 @@ if build "yasm"; then
172171
fi
173172

174173
if build "opencore"; then
175-
download "http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.3.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fopencore-amr%2Ffiles%2Fopencore-amr%2F&ts=1442256558&use_mirror=netassist" "opencore-amr-0.1.3.tar.gz"
176-
cd $PACKAGES/opencore-amr-0.1.3 || exit
174+
download "http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.5.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fopencore-amr%2Ffiles%2Fopencore-amr%2F&ts=1442256558&use_mirror=netassist" "opencore-amr-0.1.5.tar.gz"
175+
cd $PACKAGES/opencore-amr-0.1.5 || exit
177176
execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static
178177
execute make -j $MJOBS
179178
execute make install
@@ -215,7 +214,7 @@ if build "xvidcore"; then
215214
fi
216215

217216
if build "x264"; then
218-
download "ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20161027-2245-stable.tar.bz2" "last_x264.tar.bz2"
217+
download "ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20170328-2245.tar.bz2" "last_x264.tar.bz2"
219218
cd $PACKAGES/x264-snapshot-* || exit
220219
execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static
221220
execute make -j $MJOBS
@@ -294,7 +293,7 @@ if build "vid_stab"; then
294293
fi
295294

296295
if build "x265"; then
297-
download "https://bitbucket.org/multicoreware/x265/downloads/x265_2.1.tar.gz" "x265-2.1.tar.gz"
296+
download "https://bitbucket.org/multicoreware/x265/downloads/x265_2.3.tar.gz" "x265-2.3tar.gz"
298297
cd $PACKAGES/x265_* || exit
299298
cd source || exit
300299
execute cmake -DCMAKE_INSTALL_PREFIX:PATH=${WORKSPACE} -DENABLE_SHARED:bool=off .
@@ -306,9 +305,8 @@ if build "x265"; then
306305
fi
307306

308307
if build "fdk_aac"; then
309-
download "https://github.com/mstorsjo/fdk-aac/archive/master.tar.gz" "fdk-aac.zip"
308+
download "http://downloads.sourceforge.net/project/opencore-amr/fdk-aac/fdk-aac-0.1.5.tar.gz?r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fopencore-amr%2Ffiles%2Ffdk-aac%2F&ts=1457561564&use_mirror=kent" "fdk-aac-0.1.5.tar.gz"
310309
cd $PACKAGES/fdk-aac* || exit
311-
execute ./autogen.sh
312310
execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static
313311
execute make -j $MJOBS
314312
execute make install

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.