diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 4e4d02168..e782f219c 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -368,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index 0cfbb5d67..b0276d654 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile index ea17d35b1..e51e8c8a0 100644 --- a/docker-images/2.8/scratch/Dockerfile +++ b/docker-images/2.8/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 8ea9c20e2..c0da560cd 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -370,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index 68eacc64f..c398f6fbf 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -368,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index cd3d151fc..bee8eb1e1 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile index 756fee635..b8fc89d03 100644 --- a/docker-images/3.0/scratch/Dockerfile +++ b/docker-images/3.0/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index dd89d623b..12824e922 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -370,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index 986d5f074..4f0dd4309 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -368,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index ca2675358..df25b3ca1 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile index f03c682b7..a14b6b6be 100644 --- a/docker-images/3.1/scratch/Dockerfile +++ b/docker-images/3.1/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 7338262b7..eb739048b 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -370,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index d333c0ca9..34eb25b93 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -368,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index f4b8709cc..301908644 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index ed5680a0f..d9a2d83b2 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 1760dc9ea..0bb2de3b3 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -370,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 10de91d02..e2abdfd9b 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -368,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 5bd0f6134..095c14db5 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index f4d3fa77d..533d0de1a 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 0734a7027..154a445cf 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -370,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 6194b8006..6080bf9d5 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -368,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index f71b075b4..3fcafa71d 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index 5ae499089..0846efa96 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 1e3b8cabc..c463a8cfc 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -370,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index d709c20a5..463cab199 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -368,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index a1f5a264a..3de13e888 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 367838c64..2dc3a3e63 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 332ebf0ab..ff8a63602 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -370,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 37220cc5d..4a898a8c2 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -368,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 35c9ea71c..90f670177 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -369,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index 62ebc15a0..91d7f8a34 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index f6a52faeb..5a7fde70f 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ @@ -370,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/templates/.Dockerfile-env.swp b/templates/.Dockerfile-env.swp new file mode 100644 index 000000000..e6721d542 Binary files /dev/null and b/templates/.Dockerfile-env.swp differ diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index 0e05c28f5..2c1a918e8 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -265,6 +265,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/templates/Dockerfile-template.alpine b/templates/Dockerfile-template.alpine index a9c949d77..841b6ec2f 100644 --- a/templates/Dockerfile-template.alpine +++ b/templates/Dockerfile-template.alpine @@ -40,6 +40,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} %%RUN%% @@ -59,5 +60,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/templates/Dockerfile-template.centos b/templates/Dockerfile-template.centos index 714592a58..acd5c234b 100644 --- a/templates/Dockerfile-template.centos +++ b/templates/Dockerfile-template.centos @@ -39,6 +39,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -60,5 +61,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/templates/Dockerfile-template.scratch b/templates/Dockerfile-template.scratch index a1666a966..39b84c4e6 100644 --- a/templates/Dockerfile-template.scratch +++ b/templates/Dockerfile-template.scratch @@ -35,6 +35,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/templates/Dockerfile-template.ubuntu b/templates/Dockerfile-template.ubuntu index 4943c41b8..01c481191 100644 --- a/templates/Dockerfile-template.ubuntu +++ b/templates/Dockerfile-template.ubuntu @@ -41,6 +41,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -61,5 +62,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output