From 0a9c727203eeb52a1aa4e1f5a11d6d02f85dcfea Mon Sep 17 00:00:00 2001 From: Alfred Gutierrez Date: Thu, 15 Apr 2021 22:10:33 -0700 Subject: [PATCH] FFmpeg 4.4 (#95) * FFmpeg 4.4 * upgrade: ffmpeg 4.4 for cuda image and update readme. --- Dockerfile | 2 +- Dockerfile.cuda | 2 +- README.md | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5eed860..798289a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG NGINX_VERSION=1.19.7 ARG NGINX_RTMP_VERSION=1.2.1 -ARG FFMPEG_VERSION=4.3.2 +ARG FFMPEG_VERSION=4.4 ############################## diff --git a/Dockerfile.cuda b/Dockerfile.cuda index cf49ff7..6606a8e 100644 --- a/Dockerfile.cuda +++ b/Dockerfile.cuda @@ -1,6 +1,6 @@ ARG NGINX_VERSION=1.18.0 ARG NGINX_RTMP_VERSION=1.2.1 -ARG FFMPEG_VERSION=4.3.1 +ARG FFMPEG_VERSION=4.4 ############################## diff --git a/README.md b/README.md index ebffd3c..cb78e92 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ default settings for HLS live streaming. Built on Alpine Linux. * Nginx 1.19.7 (Mainline version compiled from source) * nginx-rtmp-module 1.2.1 (compiled from source) -* ffmpeg 4.3.2 (compiled from source) +* ffmpeg 4.4 (compiled from source) * Default HLS settings (See: [nginx.conf](nginx.conf)) [![Docker Stars](https://img.shields.io/docker/stars/alfg/nginx-rtmp.svg)](https://hub.docker.com/r/alfg/nginx-rtmp/) @@ -79,18 +79,18 @@ http://localhost:8080/live/$STREAM_NAME.m3u8 ``` $ ffmpeg -buildconf -ffmpeg version 4.3.1 Copyright (c) 2000-2020 the FFmpeg developers - built with gcc 9.3.0 (Alpine 9.3.0) +ffmpeg version 4.4 Copyright (c) 2000-2021 the FFmpeg developers + built with gcc 10.2.1 (Alpine 10.2.1_pre1) 20201203 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' - libavutil 56. 51.100 / 56. 51.100 - libavcodec 58. 91.100 / 58. 91.100 - libavformat 58. 45.100 / 58. 45.100 - libavdevice 58. 10.100 / 58. 10.100 - libavfilter 7. 85.100 / 7. 85.100 + libavutil 56. 70.100 / 56. 70.100 + libavcodec 58.134.100 / 58.134.100 + libavformat 58. 76.100 / 58. 76.100 + libavdevice 58. 13.100 / 58. 13.100 + libavfilter 7.110.100 / 7.110.100 libavresample 4. 0. 0 / 4. 0. 0 - libswscale 5. 7.100 / 5. 7.100 - libswresample 3. 7.100 / 3. 7.100 - libpostproc 55. 7.100 / 55. 7.100 + libswscale 5. 9.100 / 5. 9.100 + libswresample 3. 9.100 / 3. 9.100 + libpostproc 55. 9.100 / 55. 9.100 configuration: --prefix=/usr/local