Merged nvenc installation fixes

Author: rsnk96

README.md

@@ -15,7 +15,7 @@ The FFmpeg build script provides an easy way to build a static FFmpeg on **OSX**
 
 ## Disclaimer
 Use this script at your own risk. I maintain this script in my spare time. 
-Please do not file bug reports for systems other than Debian 9 and macOS 10.13
+Please do not file bug reports for systems other than Debian 10 and macOS 10.15.x
 because I don't have the resources and the time to maintain other systems.
 
 
@@ -31,7 +31,20 @@ because I don't have the resources and the time to maintain other systems.
 * `vorbis`: Lossy audio compression format
 * `theora`: Free lossy video compression format
 * `opus`: Lossy audio coding format
-* `nv-codec`: NVIDIA's GPU accelerated video codecs(H264 and HEVC). Installation is triggered only if CUDA installation is detected, follow [these](#Cuda-installation) instructions for installation
+* `nv-codec`: [NVIDIA's GPU accelerated video codecs](https://devblogs.nvidia.com/nvidia-ffmpeg-transcoding-guide/). Installation is triggered only if CUDA installation is detected, follow [these](#Cuda-installation) instructions for installation. Supported codecs in nvcodec:
+ * Decoders
+ * H264 `h264_cuvid`
+ * H265 `hevc_cuvid`
+ * Motion JPEG `mjpeg_cuvid`
+ * MPEG1 video `mpeg1_cuvid`
+ * MPEG2 video `mpeg2_cuvid`
+ * MPEG4 part 2 video `mepg4_cuvid`
+ * VC-1 `vc1_cuvid`
+ * VP8 `vp8_cuvid`
+ * VP9 `vp9_cuvid`
+ * Encoders
+ * H264 `nvenc nvenc_h264`
+ * H265 `nvenc_hevc` 
 
 ## Continuos Integration
 ffmpeg-build-script is rockstable. Every commit runs against Linux and OSX with https://travis-ci.org just to make sure everything works as expected.
@@ -43,7 +56,7 @@ Requirements OSX
 
 Requirements Linux
 ------------
-* Debian >= Wheezy, Ubuntu => Trusty, other Distros might work too
+* Debian >= Buster, Ubuntu => Trusty, other Distros might work too
 * build-essentials installed:
 
 ```
@@ -108,6 +121,7 @@ Tested on
 
 * Mac OSX 10.14 64Bit XCode 11.0
 * Debian 9.11
+* CemtOS 7.7 (Without Lib AOM and Lib Openssl activated)
 
 Example
 -------

build-ffmpeg

@@ -2,7 +2,7 @@
 
 # https://github.com/markus-perl/ffmpeg-build-script
 
-VERSION=1.7
+VERSION=1.8
 CWD=$(pwd)
 PACKAGES="$CWD/packages"
 WORKSPACE="$CWD/workspace"
@@ -242,8 +242,8 @@ if build "xvidcore"; then
 fi
 
 if build "x264"; then
-download "http://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20191008-2245-stable.tar.bz2" "last_x264.tar.bz2"
-cd $PACKAGES/x264-snapshot-* || exit
+download "https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2" "last_x264.tar.bz2"
+cd $PACKAGES/x264-stable || exit
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
 execute ./configure --prefix=${WORKSPACE} --enable-static --enable-pic CXXFLAGS="-fPIC"
@@ -318,7 +318,7 @@ if build "vid_stab"; then
 fi
 
 if build "x265"; then
-download "https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.tar.gz" "x265-3.2.tar.gz"
+download "https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz" "x265-3.2.1.tar.gz"
 cd $PACKAGES/x265_* || exit
 cd source || exit
 execute cmake -DCMAKE_INSTALL_PREFIX:PATH=${WORKSPACE} -DENABLE_SHARED:bool=off .
@@ -381,14 +381,14 @@ if which nvcc > /dev/null ; then
 fi
 
 build "ffmpeg"
-download "https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/6023b9fbfef02b71f6acfb1b09e5a12fe9d276e2.tar.gz" "ffmpeg-snapshot.tar.bz2"
-cd $PACKAGES/ffmpeg-6023b9f/ || exit
+download "https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/192d1d34eb3668fa27f433e96036340e1e5077a0.tar.gz" "ffmpeg-snapshot.tar.bz2"
+cd $PACKAGES/ffmpeg-192d1d3/ || exit
 ./configure $ADDITIONAL_CONFIGURE_OPTIONS \
  --pkgconfigdir="$WORKSPACE/lib/pkgconfig" \
  --prefix=${WORKSPACE} \
  --pkg-config-flags="--static" \
- --extra-cflags="$CFLAGS" \
- --extra-ldflags="$LDFLAGS" \
+ --extra-cflags="-I$WORKSPACE/include $CFLAGS" \
+ --extra-ldflags="-L$WORKSPACE/lib $LDFLAGS" \
  --extra-libs="-lpthread -lm" \
 --enable-static \
 --disable-debug \
@@ -419,7 +419,7 @@ cd $PACKAGES/ffmpeg-6023b9f/ || exit
 execute make -j $MJOBS
 execute make install
 
- INSTALL_FOLDER="/usr/bin"
+INSTALL_FOLDER="/usr/bin"
 if [[ "$OSTYPE" == "darwin"* ]]; then
 INSTALL_FOLDER="/usr/local/bin"
 fi
@@ -434,20 +434,25 @@ if [[ $AUTOINSTALL == "yes" ]]; then
 sudo cp "$WORKSPACE/bin/ffmpeg" "$INSTALL_FOLDER/ffmpeg"
 sudo cp "$WORKSPACE/bin/ffprobe" "$INSTALL_FOLDER/ffprobe"
 echo "Done. ffmpeg is now installed to your system"
+else
+cp "$WORKSPACE/bin/ffmpeg" "$INSTALL_FOLDER/ffmpeg"
+cp "$WORKSPACE/bin/ffprobe" "$INSTALL_FOLDER/ffprobe"
+echo "Done. ffmpeg is now installed to your system"
 fi
 elif [[ ! $SKIPINSTALL == "yes" ]]; then
-if command_exists "sudo"; then
-
-read -r -p "Install the binary to your $INSTALL_FOLDER folder? [Y/n] " response
-
-case $response in
-	[yY][eE][sS]|[yY])
-	sudo cp "$WORKSPACE/bin/ffmpeg" "$INSTALL_FOLDER/ffmpeg"
-	sudo cp "$WORKSPACE/bin/ffprobe" "$INSTALL_FOLDER/ffprobe"
- echo "Done. ffmpeg is now installed to your system"
-	;;
-esac
-fi
+read -r -p "Install the binary to your $INSTALL_FOLDER folder? [Y/n] " response
+case $response in
+[yY][eE][sS]|[yY])
+if command_exists "sudo"; then
+sudo cp "$WORKSPACE/bin/ffmpeg" "$INSTALL_FOLDER/ffmpeg"
+sudo cp "$WORKSPACE/bin/ffprobe" "$INSTALL_FOLDER/ffprobe"
+else
+cp "$WORKSPACE/bin/ffmpeg" "$INSTALL_FOLDER/ffmpeg"
+cp "$WORKSPACE/bin/ffprobe" "$INSTALL_FOLDER/ffprobe"
+fi
+echo "Done. ffmpeg is now installed to your system"
+;;
+esac
 fi
 
 exit 0