Update ffmpeg from 4.2.2 to 4.3. Add openssl. Fix fdk-aac
This commit is contained in:
parent
f49858fad4
commit
40a0bd0aaa
1 changed files with 6 additions and 4 deletions
10
Dockerfile
Normal file → Executable file
10
Dockerfile
Normal file → Executable file
|
|
@ -3,18 +3,19 @@ FROM golang:1.13.6-alpine3.11 as builder
|
||||||
RUN apk add --no-cache curl
|
RUN apk add --no-cache curl
|
||||||
|
|
||||||
# ffmpeg source - https://github.com/alfg/docker-ffmpeg
|
# ffmpeg source - https://github.com/alfg/docker-ffmpeg
|
||||||
ARG FFMPEG_VERSION=4.2.2
|
ARG FFMPEG_VERSION=4.3
|
||||||
ARG PREFIX=/opt/ffmpeg
|
ARG PREFIX=/opt/ffmpeg
|
||||||
ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
|
ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
|
||||||
ARG MAKEFLAGS="-j4"
|
ARG MAKEFLAGS="-j4"
|
||||||
|
|
||||||
# FFmpeg build dependencies.
|
# FFmpeg build dependencies.
|
||||||
RUN apk add --update \
|
RUN apk update && apk add --update \
|
||||||
build-base \
|
build-base \
|
||||||
coreutils \
|
coreutils \
|
||||||
freetype-dev \
|
freetype-dev \
|
||||||
gcc \
|
gcc \
|
||||||
lame-dev \
|
lame-dev \
|
||||||
|
openssl-dev \
|
||||||
libogg-dev \
|
libogg-dev \
|
||||||
libass \
|
libass \
|
||||||
libass-dev \
|
libass-dev \
|
||||||
|
|
@ -31,8 +32,8 @@ RUN apk add --update \
|
||||||
x265-dev \
|
x265-dev \
|
||||||
yasm
|
yasm
|
||||||
|
|
||||||
# Get fdk-aac from testing.
|
# Get fdk-aac from community.
|
||||||
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
|
RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories && \
|
||||||
apk add --update fdk-aac-dev
|
apk add --update fdk-aac-dev
|
||||||
|
|
||||||
# Get ffmpeg source.
|
# Get ffmpeg source.
|
||||||
|
|
@ -48,6 +49,7 @@ RUN cd /tmp/ffmpeg-${FFMPEG_VERSION} && \
|
||||||
--enable-nonfree \
|
--enable-nonfree \
|
||||||
--enable-small \
|
--enable-small \
|
||||||
--enable-libmp3lame \
|
--enable-libmp3lame \
|
||||||
|
--enable-openssl \
|
||||||
--enable-libx264 \
|
--enable-libx264 \
|
||||||
--enable-libx265 \
|
--enable-libx265 \
|
||||||
--enable-libvpx \
|
--enable-libvpx \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue