Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-images/2.8/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ RUN \
--enable-libfdk_aac \
\
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/2.8/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ RUN \
--enable-libfdk_aac \
\
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/2.8/scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ RUN \
--enable-libfdk_aac \
\
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/2.8/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ RUN \
--enable-libfdk_aac \
\
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/2.8/vaapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ RUN \
--enable-libfdk_aac \
\
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.0/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.0/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.0/scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.0/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.0/vaapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.1/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.1/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.1/scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.1/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.1/vaapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.2/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.2/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.2/scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.2/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.2/vaapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.3/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.3/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.3/scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.3/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.3/vaapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.4/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.4/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.4/scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.4/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/3.4/vaapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/4.0/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
--enable-libaom --extra-libs=-lpthread \
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/4.0/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/4.0/scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
--enable-libaom --extra-libs=-lpthread \
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/4.0/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
--enable-libaom --extra-libs=-lpthread \
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
1 change: 1 addition & 0 deletions docker-images/4.0/vaapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
--enable-libaom --extra-libs=-lpthread \
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
21 changes: 20 additions & 1 deletion docker-images/4.1/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.1 \
ENV FFMPEG_VERSION=4.1.1 \
FDKAAC_VERSION=0.1.5 \
LAME_VERSION=3.99.5 \
LIBASS_VERSION=0.13.7 \
Expand Down Expand Up @@ -310,6 +310,22 @@ RUN \
curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2

# SVT Codecs
RUN \
DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \
git clone https://github.com/OpenVisualCloud/SVT-AV1 && \
git clone https://github.com/intel/SVT-HEVC && \
git clone https://github.com/OpenVisualCloud/SVT-VP9 && \
cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \
cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install
# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install

# Apply patches
RUN \
DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \
git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \
git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch


RUN \
Expand Down Expand Up @@ -340,6 +356,9 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
--enable-libaom --extra-libs=-lpthread \
--enable-libsvthevc \
--enable-libsvtav1 \
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
21 changes: 20 additions & 1 deletion docker-images/4.1/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.1 \
ENV FFMPEG_VERSION=4.1.1 \
FDKAAC_VERSION=0.1.5 \
LAME_VERSION=3.99.5 \
LIBASS_VERSION=0.13.7 \
Expand Down Expand Up @@ -311,6 +311,22 @@ RUN \
curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2

# SVT Codecs
RUN \
DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \
git clone https://github.com/OpenVisualCloud/SVT-AV1 && \
git clone https://github.com/intel/SVT-HEVC && \
git clone https://github.com/OpenVisualCloud/SVT-VP9 && \
cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \
cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install
# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install

# Apply patches
RUN \
DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \
git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \
git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch


RUN \
Expand Down Expand Up @@ -341,6 +357,9 @@ RUN \
--enable-libfdk_aac \
--enable-libkvazaar \
\
--enable-libsvthevc \
--enable-libsvtav1 \
\
--enable-postproc \
--enable-small \
--enable-version3 \
Expand Down
Loading