Skip to content

Commit

Permalink
4.1.5 (#208)
Browse files Browse the repository at this point in the history
  • Loading branch information
jrottenberg authored Jan 9, 2020
1 parent 4e020b1 commit 8ceaf28
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion docker-images/4.1/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.1.4 \
ENV FFMPEG_VERSION=4.1.5 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.1.4 \
ENV FFMPEG_VERSION=4.1.5 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/nvidia/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib"
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j12"

ENV FFMPEG_VERSION=4.1.4 \
ENV FFMPEG_VERSION=4.1.5 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.1.4 \
ENV FFMPEG_VERSION=4.1.5 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.1.4 \
ENV FFMPEG_VERSION=4.1.5 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/4.1/vaapi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib
ARG PREFIX=/opt/ffmpeg
ARG MAKEFLAGS="-j2"

ENV FFMPEG_VERSION=4.1.4 \
ENV FFMPEG_VERSION=4.1.5 \
AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \
FONTCONFIG_VERSION=2.12.4 \
Expand Down
12 changes: 6 additions & 6 deletions docker-images/gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,37 +71,37 @@ snapshot-nvidia:
VERSION: "4.2"
VARIANT: nvidia

4.1.4-ubuntu:
4.1.5-ubuntu:
extends: .docker
variables:
VERSION: "4.1"
VARIANT: ubuntu

4.1.4-alpine:
4.1.5-alpine:
extends: .docker
variables:
VERSION: "4.1"
VARIANT: alpine

4.1.4-centos:
4.1.5-centos:
extends: .docker
variables:
VERSION: "4.1"
VARIANT: centos

4.1.4-scratch:
4.1.5-scratch:
extends: .docker
variables:
VERSION: "4.1"
VARIANT: scratch

4.1.4-vaapi:
4.1.5-vaapi:
extends: .docker
variables:
VERSION: "4.1"
VARIANT: vaapi

4.1.4-nvidia:
4.1.5-nvidia:
extends: .docker
variables:
VERSION: "4.1"
Expand Down

0 comments on commit 8ceaf28

Please sign in to comment.