Merge pull request #1102 from juvester/fix-linux-ci

Revert "CI: Linux - Install FFmpeg from source"
This commit is contained in:
Jim
2017-12-03 14:09:58 -08:00
committed by GitHub

View File

@@ -1,12 +1,18 @@
#!/bin/sh #!/bin/sh
set -ex set -ex
sudo add-apt-repository ppa:kirillshkrogalev/ffmpeg-next -y
sudo apt-get -qq update sudo apt-get -qq update
sudo apt-get install -y \ sudo apt-get install -y \
build-essential \ build-essential \
checkinstall \ checkinstall \
cmake \ cmake \
libasound2-dev \ libasound2-dev \
libavcodec-ffmpeg-dev \
libavdevice-ffmpeg-dev \
libavfilter-ffmpeg-dev \
libavformat-ffmpeg-dev \
libavutil-ffmpeg-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libfdk-aac-dev \ libfdk-aac-dev \
libfontconfig-dev \ libfontconfig-dev \
@@ -17,6 +23,8 @@ sudo apt-get install -y \
libpulse-dev \ libpulse-dev \
libqt5x11extras5-dev \ libqt5x11extras5-dev \
libspeexdsp-dev \ libspeexdsp-dev \
libswresample-ffmpeg-dev \
libswscale-ffmpeg-dev \
libudev-dev \ libudev-dev \
libv4l-dev \ libv4l-dev \
libvlc-dev \ libvlc-dev \
@@ -27,14 +35,4 @@ sudo apt-get install -y \
libxcomposite-dev \ libxcomposite-dev \
libxinerama-dev \ libxinerama-dev \
pkg-config \ pkg-config \
qtbase5-dev \ qtbase5-dev
yasm \
zlib1g-dev
# FFmpeg
cd ..
git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git
cd ffmpeg
./configure --enable-shared
make -j2
sudo make install