Revert "ffmpeg: Add CUDA/LLVM to install script."

This reverts commit c423f33.
livepeer · Jan 8, 2020 · b91108c · b91108c
1 parent b37ad86
commit b91108c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
           name: "Build FFMpeg"
           command: |
             sudo apt-get update
-            sudo apt-get install -y autoconf build-essential pkg-config autoconf gnutls-dev zlib1g-dev netcat-openbsd clang
+            sudo apt-get install -y autoconf build-essential pkg-config autoconf gnutls-dev zlib1g-dev netcat-openbsd
             bash ./install_ffmpeg.sh
 
       - save_cache:

diff --git a/install_ffmpeg.sh b/install_ffmpeg.sh
@@ -23,19 +23,10 @@ if [ ! -e "$HOME/x264/x264" ]; then
   make install-lib-static
 fi
 
-if [ ! -e "$HOME/nv-codec-headers" ]; then
-  git clone https://git.videolan.org/git/ffmpeg/nv-codec-headers.git "$HOME/nv-codec-headers"
-  cd "$HOME/nv-codec-headers"
-  git checkout 9fdaf11b8f79d4e41cde9af89656238f25fec6fd
-  make -e PREFIX="$HOME/compiled"
-  make install -e PREFIX="$HOME/compiled"
-fi
-
 if [ ! -e "$HOME/ffmpeg/libavcodec/libavcodec.a" ]; then
   git clone -b livepeer-2019_11_19 https://github.com/livepeer/FFmpeg "$HOME/ffmpeg" || echo "FFmpeg dir already exists"
   cd "$HOME/ffmpeg"
-  ./configure --prefix="$HOME/compiled" --enable-libx264 --enable-gnutls --enable-gpl --enable-nvenc --enable-cuda-llvm --enable-static
-
+  ./configure --prefix="$HOME/compiled" --enable-libx264 --enable-gnutls --enable-gpl --enable-static
   make
   make install
 fi