Skip to content
This repository has been archived by the owner on Sep 16, 2024. It is now read-only.

Commit

Permalink
[v21.6] Enable Nonfree for ffmpeg when fdkaac is enabled (#782)
Browse files Browse the repository at this point in the history
* Update Docker image README (#704)

* update README

* Update dockerfiles

* [master] Fix Opencv 4.5.2 build with Toolset on Centos 7 (#746)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix opencv 4.5.2 build with toolset

Co-authored-by: jhou5 <[email protected]>

* [master] Upgrade Meson for Ubuntu-20.04 (#748)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* meson version fix

Co-authored-by: jhou5 <[email protected]>

* [master] Test fixes for Release v21.6 - part 1 (#750)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* v216 tests update - part 1

Co-authored-by: jhou5 <[email protected]>

* [master] Test fixes for Release v21.6 - part 2 (#755)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* v216 tests update - part 1

* Test fixes for Release v21.6 - part 2

Co-authored-by: jhou5 <[email protected]>

* [master] Bug fixes for Release v21.6 (#757)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* Bug fixes for v21.6. See details

- QAT Engine build param fix
- revert scvp change for owt360
- test name change for proper injection of tests
- devoolset opencv fix
- nginx conf sw_fallback off

* revert accidental fdkaac change

Co-authored-by: jhou5 <[email protected]>

* [master] Owt boost revert (#759)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* revert boost for owt on centos7

Co-authored-by: jhou5 <[email protected]>

* [master] Fix Ipsec caused u2004 bug (#762)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix ipsecmb caused system fault in u2004

Co-authored-by: jhou5 <[email protected]>

* [master] Dldt Video Analytics test fix (#764)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix dldt gva tests broken by links

Co-authored-by: jhou5 <[email protected]>

* Ubuntu 20.04 fix for vaapi failures (#766)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix u2004 images for vaapi due to lib change

Co-authored-by: jhou5 <[email protected]>

* [master] License Triggered changes from PDT feedback (#768)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* ffmpeg/openssl/libvmaf license related changes

* ffmpeg-nonfree change

* restructure gpl flag

* gpl changes for 264/265 properly

* re-add the components needed for 264/265 building & test changes

Co-authored-by: jhou5 <[email protected]>

* [master] Fix test config for vmaf  (#770)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* vmaf test config fix

Co-authored-by: jhou5 <[email protected]>

* [master] Don't Load 264 tests for nginx dev images (#772)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* nginx test load change for dev images

Co-authored-by: jhou5 <[email protected]>

* Doc changes for 21.6

* [master] Document updates for release 216 (#774)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* Doc changes for 21.6

Co-authored-by: jhou5 <[email protected]>

* push dockerfiles remaining changes

* [master] Push left over changes to master (#776)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* Doc changes for 21.6

* push dockerfiles remaining changes

Co-authored-by: jhou5 <[email protected]>

* [master] QAT readme update & yasm repo change (#777)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* Doc changes for 21.6

* push dockerfiles remaining changes

* QAT readme change and yasm fix

Co-authored-by: jhou5 <[email protected]>

* README version changes for 21.6

* [master] Readme version update for 216 (#779)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* Doc changes for 21.6

* push dockerfiles remaining changes

* README version changes for 21.6

* adding links to QAT NGINX_SW Images

Co-authored-by: jhou5 <[email protected]>

* enable non-free if fdkaac is enabled

Co-authored-by: jhou5 <[email protected]>
  • Loading branch information
dpatel257 and jhou5 authored Jul 26, 2021
1 parent 5533a12 commit eb60015
Show file tree
Hide file tree
Showing 64 changed files with 64 additions and 64 deletions.
2 changes: 1 addition & 1 deletion SG1/centos-7/media/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion SG1/centos-7/media/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion SG1/ubuntu-18.04/media/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion SG1/ubuntu-18.04/media/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion SG1/ubuntu-20.04/media/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion SG1/ubuntu-20.04/media/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion Xeon/centos-7/analytics/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion Xeon/centos-7/analytics/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
2 changes: 1 addition & 1 deletion Xeon/centos-7/analytics/gst/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \
RUN cd /opt/build/FFmpeg-n4.4 && \
./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \
--disable-manpages --disable-podpages --disable-txtpages \
--extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
--extra-cflags=-w --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \
make install DESTDIR=/opt/dist && \
make install

Expand Down
Loading

0 comments on commit eb60015

Please sign in to comment.