diff --git a/external/bin/ffmpeg b/external/bin/ffmpeg deleted file mode 120000 index 68be8c068..000000000 --- a/external/bin/ffmpeg +++ /dev/null @@ -1 +0,0 @@ -../ffmpeg/bin/ffmpeg \ No newline at end of file diff --git a/external/bin/ffprobe b/external/bin/ffprobe deleted file mode 120000 index 3948a822b..000000000 --- a/external/bin/ffprobe +++ /dev/null @@ -1 +0,0 @@ -../ffmpeg/bin/ffprobe \ No newline at end of file diff --git a/external/ffmpeg/bin/ffmpeg b/external/ffmpeg/bin/ffmpeg deleted file mode 100755 index 1efc6b415..000000000 Binary files a/external/ffmpeg/bin/ffmpeg and /dev/null differ diff --git a/external/ffmpeg/bin/ffmpeg_cuda b/external/ffmpeg/bin/ffmpeg_cuda deleted file mode 100755 index f10ced49f..000000000 --- a/external/ffmpeg/bin/ffmpeg_cuda +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f32ffc250a25c87f3ae80d5886f9604ff28966241c53d010e00dcdff9d788f7 -size 21915808 diff --git a/external/ffmpeg/bin/ffplay b/external/ffmpeg/bin/ffplay deleted file mode 100755 index 1f36f17b7..000000000 Binary files a/external/ffmpeg/bin/ffplay and /dev/null differ diff --git a/external/ffmpeg/bin/ffprobe b/external/ffmpeg/bin/ffprobe deleted file mode 100755 index 5d6ce6f15..000000000 Binary files a/external/ffmpeg/bin/ffprobe and /dev/null differ diff --git a/external/ffmpeg/build.sh b/external/ffmpeg/build.sh deleted file mode 100755 index c98941fc5..000000000 --- a/external/ffmpeg/build.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -e - -### EXCELENT GUIDE TO STATIC COMPILATION! -### https://gist.github.com/Brainiarc7/988473b79fd5c8f0db54b92ebb47387a - -cd "$(dirname "${BASH_SOURCE[0]}")" - -# main binaries from ffmpeg-static -#wget http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz -#tar xvf ffmpeg-release-64bit-static.tar.xz -#cp ffmpeg-3.2.2-64bit-static/ffmpeg bin/ -#cp ffmpeg-3.2.2-64bit-static/ffprobe bin/ - -rm -rf nasm-2.14.02 -wget http://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.gz -tar xzvf nasm-2.14.02.tar.gz -pushd nasm-2.14.02 - ./configure - make -j$(nproc) VERBOSE=1 - sudo make -j$(nproc) install - make -j$(nproc) distclean -popd - -rm -rf nv-codec-headers -git clone https://git.videolan.org/git/ffmpeg/nv-codec-headers.git -pushd nv-codec-headers - sudo make install -popd - -rm -rf fdk-aac -git clone https://github.com/mstorsjo/fdk-aac -pushd fdk-aac - autoreconf -fiv - ./configure --disable-shared - make -j$(nproc) - sudo make -j$(nproc) install - make -j$(nproc) distclean -popd - -rm -rf x264 -git clone http://git.videolan.org/git/x264.git -b stable -pushd x264/ - ./configure --enable-static --enable-pic --bit-depth=all - make -j$(nproc) VERBOSE=1 - sudo make -j$(nproc) install VERBOSE=1 - make -j$(nproc) distclean -popd - -# binary with cuda decoding enabled -#git clone --depth 1 git@github.com:commaai/ffmpeg.git -rm -rf ffmpeg -git clone https://git.ffmpeg.org/ffmpeg.git -pushd ffmpeg - # replace npp dynamic lib refs with static lib refs - sed 's/-lnpp\(\w\+\)/-lnpp\1_static/g' configure > configure_npp_static - chmod ug+x configure_npp_static - ./configure_npp_static --pkg-config-flags="--static" --enable-static --disable-debug --disable-alsa --enable-libfdk-aac --enable-libx264 --disable-ffplay --disable-libxcb --disable-sdl2 --enable-cuda-nvcc --enable-cuvid --enable-nvenc --enable-libnpp --enable-nonfree --enable-gpl --extra-cflags=-I/usr/local/cuda/include --extra-ldflags=-L/usr/local/cuda/lib64 --extra-libs="-lcudart_static -lculibos -ldl -lrt -pthread -lstdc++" - make -j10 - # replaced by above sed and specifying --extra-libs="-lcudart_static -lculibos -ldl -lrt -pthread -lstdc++" - ### manually build last few libs statically - ##g++ -Llibavcodec -Llibavdevice -Llibavfilter -Llibavformat -Llibavresample -Llibavutil -Llibpostproc -Llibswscale -Llibswresample -L/usr/local/cuda/lib64 -Wl,--as-needed -Wl,-z,noexecstack -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample -o ffmpeg_g cmdutils.o ffmpeg_opt.o ffmpeg_filter.o ffmpeg.o ffmpeg_cuvid.o -lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -ldl -ldl -l:libnppi_static.a -l:libnppc_static.a -l:libcudart_static.a -l:libculibos.a -lrt -lm -l:liblzma.a -l:libbz2.a -l:libz.a -pthread - ##cp ffmpeg_g ffmpeg - ##strip ffmpeg -popd -cp ffmpeg/ffmpeg bin/ffmpeg diff --git a/external/ffmpeg/larch64/.gitignore b/external/ffmpeg/larch64/.gitignore deleted file mode 100644 index 565b7ee23..000000000 --- a/external/ffmpeg/larch64/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ffmpeg-4.2.2* diff --git a/external/ffmpeg/larch64/build.sh b/external/ffmpeg/larch64/build.sh deleted file mode 100755 index ffa5a089e..000000000 --- a/external/ffmpeg/larch64/build.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -e -sudo apt-get remove ffmpeg libavcodec-dev - -sudo apt-get update -qq && sudo apt-get -y install \ - autoconf \ - automake \ - build-essential \ - cmake \ - git-core \ - libass-dev \ - libfreetype6-dev \ - libsdl2-dev \ - libtool \ - libva-dev \ - libvdpau-dev \ - libvorbis-dev \ - libxcb1-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - pkg-config \ - texinfo \ - wget \ - zlib1g-dev -wget https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.bz2 -tar xvf ffmpeg-4.2.2.tar.bz2 -cd ffmpeg-4.2.2 - -./configure --enable-shared -make -j8 -make install -