Skip to content

Commit 84f36a6

Browse files
authored
Merge pull request #17 from Trivernis/develop
(Last?) Release Candidate before release
2 parents eb2062e + 3499ee9 commit 84f36a6

31 files changed

Lines changed: 610 additions & 383 deletions

Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ RUN apt-get install -y \
1919
curl \
2020
wget \
2121
pkg-config \
22-
libavutil-dev \
23-
libavformat-dev \
24-
libavcodec-dev \
25-
libavfilter-dev \
26-
libavdevice-dev \
2722
clang \
2823
nodejs \
2924
npm \
@@ -39,4 +34,4 @@ ENV PATH="/root/.cargo/bin:${PATH}"
3934

4035
RUN python3 scripts/clean.py
4136
RUN python3 scripts/check.py --install
42-
RUN python3 scripts/build.py all --verbose --ffmpeg
37+
RUN python3 scripts/build.py all --verbose

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,14 @@ $ ./scripts/check.py --install
7777
7878
All Componens:
7979
```sh
80-
$ ./scripts/build.py all --ffmpeg
80+
$ ./scripts/build.py all
8181
```
8282

8383
Daemon only:
8484
```sh
85-
$ ./scripts/build.py daemon --ffmpeg
85+
$ ./scripts/build.py daemon
8686
```
8787

88-
If you don't want to build with ffmpeg support omit the `--ffmpeg` flag.
89-
9088
UI only:
9189
```sh
9290
$ ./scripts/build.py ui

0 commit comments

Comments
 (0)