Commit6d7cf07

committed

Checkout libx264 before failing commit for FFmpeg version 2.x

1 parent4d9d060 commit6d7cf07Copy full SHA for 6d7cf07

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,12 @@ if [ -z ${TRAVIS_JOB_ID} ] \|\| [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then`
`29`	`29`	`# x264`
`30`	`30`	`echo""`
`31`	`31`	`echo"Building x264 (last version)"`
	`32`	`+# or before commit https://code.videolan.org/videolan/x264/commit/e9a5903edf8ca59ef20e6f4894c196f135af735e`
	`33`	`+# => see https://trac.ffmpeg.org/ticket/6932`
`32`	`34`	`DIR=$(mktemp -d x264XXX)&&cd${DIR}&& \`
`33`		`- git clone--depth 1 git://git.videolan.org/x264&& \`
	`35`	`+ git clonehttps://code.videolan.org/videolan/x264.git&& \`
`34`	`36`	`cd x264&& \`
	`37`	`+if [[${DEPENDENCY_VERSION}== 2.. ]];then git checkout ba24899b0bf23345921da022f7a51e0c57dbe73d;fi`
`35`	`38`	`./configure --prefix="$DEPENDENCY_INSTALL_PATH" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-shared --disable-asm&& \`
`36`	`39`	`make -k>${DEPENDENCY_LOG_FILE}2>&1&& \`
`37`	`40`	`if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi`

Comments

(0)