Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit bd1c0b5

Browse filesBrowse files
committed
Merge branch 'master' into sr/linux-descript
2 parents 3e15e8d + 7991ba6 commit bd1c0b5
Copy full SHA for bd1c0b5

File tree

Expand file treeCollapse file tree

8 files changed

+632
-331
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+632
-331
lines changed

‎.github/workflows/build.yml

Copy file name to clipboardExpand all lines: .github/workflows/build.yml
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: build ffmpeg
2424
run: |
2525
while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
26-
SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build
26+
SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build --enable-gpl-and-non-free
2727
kill %1
2828
- name: check shared library
2929
run: |
@@ -45,7 +45,7 @@ jobs:
4545
- name: build ffmpeg
4646
run: |
4747
while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
48-
SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build
48+
SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build --enable-gpl-and-non-free
4949
kill %1
5050
- name: check shared library
5151
run: |
@@ -89,12 +89,12 @@ jobs:
8989
- name: pull base image
9090
id: cuda_ubuntu_pull
9191
run: |
92-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
92+
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
9393
docker pull ubuntu:20.04
9494
- name: run if cuda_ubuntu_pull failed
9595
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
9696
run: |
97-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
97+
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
9898
docker pull ubuntu:20.04
9999
- name: build ffmpeg
100100
run: |
@@ -113,12 +113,12 @@ jobs:
113113
- name: pull base image
114114
id: cuda_centos_pull
115115
run: |
116-
docker pull nvidia/cuda:11.1-devel-centos8
116+
docker pull nvidia/cuda:11.4.2-devel-centos8
117117
docker pull centos:8
118118
- name: run if cuda_centos_pull failed
119119
if: failure() && steps.cuda_centos_pull.outcome == 'failure'
120120
run: |
121-
docker pull nvidia/cuda:11.1-devel-centos8
121+
docker pull nvidia/cuda:11.4.2-devel-centos8
122122
docker pull centos:8
123123
- name: build ffmpeg
124124
run: |
@@ -137,11 +137,11 @@ jobs:
137137
- name: pull base image
138138
id: cuda_ubuntu_pull
139139
run: |
140-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
140+
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
141141
- name: run if cuda_ubuntu_pull failed
142142
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
143143
run: |
144-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
144+
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
145145
- name: build ffmpeg
146146
run: |
147147
docker build -t ffmpeg:cuda-static -f full-static.dockerfile .

‎Dockerfile

Copy file name to clipboardExpand all lines: Dockerfile
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ FROM ubuntu:20.04 AS build
33
ENV DEBIAN_FRONTEND noninteractive
44

55
RUN apt-get update \
6-
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev python \
6+
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
7+
python3 python-is-python3 ninja-build meson \
78
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
89
&& update-ca-certificates
910

@@ -32,4 +33,4 @@ RUN ldd /usr/bin/ffprobe
3233
RUN ldd /usr/bin/ffplay
3334

3435
CMD ["--help"]
35-
ENTRYPOINT ["/usr/bin/ffmpeg"]
36+
ENTRYPOINT ["/usr/bin/ffmpeg"]

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.