Skip to content

Commit d801121

Browse files
authored
Upgrade NGINX to 1.18.0 and FFmpeg to 4.3.1. (#71)
* Upgrade NGINX to 1.18.0 and FFmpeg to 4.3.1. * Fix readme.
1 parent a6a2f8b commit d801121

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG NGINX_VERSION=1.16.1
1+
ARG NGINX_VERSION=1.18.0
22
ARG NGINX_RTMP_VERSION=1.2.1
3-
ARG FFMPEG_VERSION=4.2.2
3+
ARG FFMPEG_VERSION=4.3.1
44

55

66
##############################

README.md

+14-15
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
A Dockerfile installing NGINX, nginx-rtmp-module and FFmpeg from source with
33
default settings for HLS live streaming. Built on Alpine Linux.
44

5-
* Nginx 1.16.1 (Stable version compiled from source)
5+
* Nginx 1.18.0 (Stable version compiled from source)
66
* nginx-rtmp-module 1.2.1 (compiled from source)
7-
* ffmpeg 4.2.1 (compiled from source)
7+
* ffmpeg 4.3.1 (compiled from source)
88
* Default HLS settings (See: [nginx.conf](nginx.conf))
99

1010
[![Docker Stars](https://img.shields.io/docker/stars/alfg/nginx-rtmp.svg)](https://hub.docker.com/r/alfg/nginx-rtmp/)
@@ -67,25 +67,25 @@ volumes:
6767
http://<server ip>:8080/live/$STREAM_NAME.m3u8
6868
```
6969
* Example Playlist: `http://localhost:8080/live/hello.m3u8`
70-
* [VideoJS Player](https://video-dev.github.io/hls.js/stable/demo/?src=http%3A%2F%2Flocalhost%3A8080%2Flive%2Fhello.m3u8)
70+
* [VideoJS Player](https://hls-js.netlify.app/demo/?src=http%3A%2F%2Flocalhost%3A8080%2Flive%2Fhello.m3u8)
7171
* FFplay: `ffplay -fflags nobuffer rtmp://localhost:1935/stream/hello`
7272
7373
### FFmpeg Build
7474
```
7575
$ ffmpeg -buildconf
7676

77-
ffmpeg version 4.2.1 Copyright (c) 2000-2019 the FFmpeg developers
78-
built with gcc 6.4.0 (Alpine 6.4.0)
79-
configuration: --prefix=/usr/local --enable-version3 --enable-gpl --enable-nonfree --enable-small --enable-libmp3lame --enable-libx264 --enable-libx265 --enable-libvpx --enable-libtheora --enable-libvorbis --enable-libopus --enable-libfdk-aac --enable-libass --enable-libwebp --enable-librtmp --enable-postproc --enable-avresample --enable-libfreetype --enable-openssl --disable-debug --disable-doc --disable-ffplay --extra-libs='-lpthread -lm'
80-
libavutil 56. 31.100 / 56. 31.100
81-
libavcodec 58. 54.100 / 58. 54.100
82-
libavformat 58. 29.100 / 58. 29.100
83-
libavdevice 58. 8.100 / 58. 8.100
84-
libavfilter 7. 57.100 / 7. 57.100
77+
ffmpeg version 4.3.1 Copyright (c) 2000-2020 the FFmpeg developers
78+
built with gcc 9.3.0 (Alpine 9.3.0)
79+
configuration: --prefix=/usr/local --enable-version3 --enable-gpl --enable-nonfree --enable-small --enable-libmp3lame --enable-libx264 --enable-libx265 --enable-libvpx --enable-libtheora --enable-libvorbis --enable-libopus --enable-libfdk-aac --enable-libass --enable-libwebp --enable-postproc --enable-avresample --enable-libfreetype --enable-openssl --disable-debug --disable-doc --disable-ffplay --extra-libs='-lpthread -lm'
80+
libavutil 56. 51.100 / 56. 51.100
81+
libavcodec 58. 91.100 / 58. 91.100
82+
libavformat 58. 45.100 / 58. 45.100
83+
libavdevice 58. 10.100 / 58. 10.100
84+
libavfilter 7. 85.100 / 7. 85.100
8585
libavresample 4. 0. 0 / 4. 0. 0
86-
libswscale 5. 5.100 / 5. 5.100
87-
libswresample 3. 5.100 / 3. 5.100
88-
libpostproc 55. 5.100 / 55. 5.100
86+
libswscale 5. 7.100 / 5. 7.100
87+
libswresample 3. 7.100 / 3. 7.100
88+
libpostproc 55. 7.100 / 55. 7.100
8989

9090
configuration:
9191
--prefix=/usr/local
@@ -103,7 +103,6 @@ ffmpeg version 4.2.1 Copyright (c) 2000-2019 the FFmpeg developers
103103
--enable-libfdk-aac
104104
--enable-libass
105105
--enable-libwebp
106-
--enable-librtmp
107106
--enable-postproc
108107
--enable-avresample
109108
--enable-libfreetype

0 commit comments

Comments
 (0)