Skip to content

Commit 6d7cf07

Browse files
committed
Checkout libx264 before failing commit for FFmpeg version 2.x
Checkout before commit https://code.videolan.org/videolan/x264/commit/e9a5903edf8ca59ef20e6f4894c196f135af735e => see https://trac.ffmpeg.org/ticket/6932
1 parent 4d9d060 commit 6d7cf07

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

tools/travis/linux.install.deps.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
2929
# x264
3030
echo ""
3131
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
3234
DIR=$(mktemp -d x264XXX) && cd ${DIR} && \
33-
git clone --depth 1 git://git.videolan.org/x264 && \
35+
git clone https://code.videolan.org/videolan/x264.git && \
3436
cd x264 && \
37+
if [[ ${DEPENDENCY_VERSION} == 2.*.* ]]; then git checkout ba24899b0bf23345921da022f7a51e0c57dbe73d; fi
3538
./configure --prefix="$DEPENDENCY_INSTALL_PATH" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-shared --disable-asm && \
3639
make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
3740
if [ $? != 0 ]; then cat ${DEPENDENCY_LOG_FILE} && exit 1; fi

0 commit comments

Comments
 (0)