formatting

LordNex · Jul 3, 2021 · 1794488 · 1794488
1 parent b24bb3e
commit 1794488
Show file tree

Hide file tree

Showing 5 changed files with 215 additions and 215 deletions.
diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64
@@ -6,11 +6,11 @@ ENV LIBVA_DRIVER_NAME=i965
 # Install packages for apt repo
 RUN apt-get -qq update \
  && apt-get -qq install --no-install-recommends -y \
-  # ffmpeg dependencies
-  libgomp1 \
-  # VAAPI drivers for Intel hardware accel
-  libva-drm2 libva2 libmfx1 i965-va-driver vainfo intel-media-va-driver mesa-va-drivers \
-  ## Tensorflow lite
+ # ffmpeg dependencies
+ libgomp1 \
+ # VAAPI drivers for Intel hardware accel
+ libva-drm2 libva2 libmfx1 i965-va-driver vainfo intel-media-va-driver mesa-va-drivers \
+ ## Tensorflow lite
  && wget -q https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \
  && python3.8 -m pip install tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \
  && rm tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \

diff --git a/docker/Dockerfile.ffmpeg.aarch64 b/docker/Dockerfile.ffmpeg.aarch64
@@ -15,33 +15,33 @@ RUN apt-get -yqq update && \
 
 FROM base as build
 
-ENV  FFMPEG_VERSION=4.3.1 \
-  AOM_VERSION=v1.0.0 \
-  FDKAAC_VERSION=0.1.5 \
-  FREETYPE_VERSION=2.5.5 \
-  FRIBIDI_VERSION=0.19.7 \
-  KVAZAAR_VERSION=1.2.0 \
-  LAME_VERSION=3.100 \
-  LIBPTHREAD_STUBS_VERSION=0.4 \
-  LIBVIDSTAB_VERSION=1.1.0 \
-  LIBXCB_VERSION=1.13.1 \
-  XCBPROTO_VERSION=1.13 \
-  OGG_VERSION=1.3.2 \
-  OPENCOREAMR_VERSION=0.1.5 \
-  OPUS_VERSION=1.2 \
-  OPENJPEG_VERSION=2.1.2 \
-  THEORA_VERSION=1.1.1 \
-  VORBIS_VERSION=1.3.5 \
-  VPX_VERSION=1.8.0 \
-  WEBP_VERSION=1.0.2 \
-  X264_VERSION=20170226-2245-stable \
-  X265_VERSION=3.1.1 \
-  XAU_VERSION=1.0.9 \
-  XORG_MACROS_VERSION=1.19.2 \
-  XPROTO_VERSION=7.0.31 \
-  XVID_VERSION=1.3.4 \
-  LIBZMQ_VERSION=4.3.2 \
-  SRC=/usr/local
+ENV FFMPEG_VERSION=4.3.1 \
+ AOM_VERSION=v1.0.0 \
+ FDKAAC_VERSION=0.1.5 \
+ FREETYPE_VERSION=2.5.5 \
+ FRIBIDI_VERSION=0.19.7 \
+ KVAZAAR_VERSION=1.2.0 \
+ LAME_VERSION=3.100 \
+ LIBPTHREAD_STUBS_VERSION=0.4 \
+ LIBVIDSTAB_VERSION=1.1.0 \
+ LIBXCB_VERSION=1.13.1 \
+ XCBPROTO_VERSION=1.13 \
+ OGG_VERSION=1.3.2 \
+ OPENCOREAMR_VERSION=0.1.5 \
+ OPUS_VERSION=1.2 \
+ OPENJPEG_VERSION=2.1.2 \
+ THEORA_VERSION=1.1.1 \
+ VORBIS_VERSION=1.3.5 \
+ VPX_VERSION=1.8.0 \
+ WEBP_VERSION=1.0.2 \
+ X264_VERSION=20170226-2245-stable \
+ X265_VERSION=3.1.1 \
+ XAU_VERSION=1.0.9 \
+ XORG_MACROS_VERSION=1.19.2 \
+ XPROTO_VERSION=7.0.31 \
+ XVID_VERSION=1.3.4 \
+ LIBZMQ_VERSION=4.3.2 \
+ SRC=/usr/local
 
 ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz"
 ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz"
@@ -61,27 +61,27 @@ ARG PREFIX=/opt/ffmpeg
 ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib"
 
 
-RUN  buildDeps="autoconf \
-  automake \
-  cmake \
-  curl \
-  bzip2 \
-  libexpat1-dev \
-  g++ \
-  gcc \
-  git \
-  gperf \
-  libtool \
-  make \
-  nasm \
-  perl \
-  pkg-config \
-  python \
-  libssl-dev \
-  yasm \
-  linux-headers-raspi2 \
-  libomxil-bellagio-dev \
-  zlib1g-dev" && \
+RUN buildDeps="autoconf \
+ automake \
+ cmake \
+ curl \
+ bzip2 \
+ libexpat1-dev \
+ g++ \
+ gcc \
+ git \
+ gperf \
+ libtool \
+ make \
+ nasm \
+ perl \
+ pkg-config \
+ python \
+ libssl-dev \
+ yasm \
+ linux-headers-raspi2 \
+ libomxil-bellagio-dev \
+ zlib1g-dev" && \
  apt-get -yqq update && \
  apt-get install -yq --no-install-recommends ${buildDeps}
 ## opencore-amr https://sourceforge.net/projects/opencore-amr/
@@ -459,7 +459,7 @@ RUN \
  cp -r ${PREFIX}/include/libav* ${PREFIX}/include/libpostproc ${PREFIX}/include/libsw* /usr/local/include && \
  mkdir -p /usr/local/lib/pkgconfig && \
  for pc in ${PREFIX}/lib/pkgconfig/libav*.pc ${PREFIX}/lib/pkgconfig/libpostproc.pc ${PREFIX}/lib/pkgconfig/libsw*.pc; do \
-  sed "s:${PREFIX}:/usr/local:g" <"$pc" >/usr/local/lib/pkgconfig/"${pc##*/}"; \
+ sed "s:${PREFIX}:/usr/local:g" <"$pc" >/usr/local/lib/pkgconfig/"${pc##*/}"; \
  done
 
 FROM base AS release

diff --git a/docker/Dockerfile.ffmpeg.amd64 b/docker/Dockerfile.ffmpeg.amd64
@@ -14,33 +14,33 @@ RUN apt-get -yqq update && \
 
 FROM base as build
 
-ENV  FFMPEG_VERSION=4.3.1 \
-  AOM_VERSION=v1.0.0 \
-  FDKAAC_VERSION=0.1.5 \
-  FREETYPE_VERSION=2.5.5 \
-  FRIBIDI_VERSION=0.19.7 \
-  KVAZAAR_VERSION=1.2.0 \
-  LAME_VERSION=3.100 \
-  LIBPTHREAD_STUBS_VERSION=0.4 \
-  LIBVIDSTAB_VERSION=1.1.0 \
-  LIBXCB_VERSION=1.13.1 \
-  XCBPROTO_VERSION=1.13 \
-  OGG_VERSION=1.3.2 \
-  OPENCOREAMR_VERSION=0.1.5 \
-  OPUS_VERSION=1.2 \
-  OPENJPEG_VERSION=2.1.2 \
-  THEORA_VERSION=1.1.1 \
-  VORBIS_VERSION=1.3.5 \
-  VPX_VERSION=1.8.0 \
-  WEBP_VERSION=1.0.2 \
-  X264_VERSION=20170226-2245-stable \
-  X265_VERSION=3.1.1 \
-  XAU_VERSION=1.0.9 \
-  XORG_MACROS_VERSION=1.19.2 \
-  XPROTO_VERSION=7.0.31 \
-  XVID_VERSION=1.3.4 \
-  LIBZMQ_VERSION=4.3.2 \
-  SRC=/usr/local
+ENV FFMPEG_VERSION=4.3.1 \
+ AOM_VERSION=v1.0.0 \
+ FDKAAC_VERSION=0.1.5 \
+ FREETYPE_VERSION=2.5.5 \
+ FRIBIDI_VERSION=0.19.7 \
+ KVAZAAR_VERSION=1.2.0 \
+ LAME_VERSION=3.100 \
+ LIBPTHREAD_STUBS_VERSION=0.4 \
+ LIBVIDSTAB_VERSION=1.1.0 \
+ LIBXCB_VERSION=1.13.1 \
+ XCBPROTO_VERSION=1.13 \
+ OGG_VERSION=1.3.2 \
+ OPENCOREAMR_VERSION=0.1.5 \
+ OPUS_VERSION=1.2 \
+ OPENJPEG_VERSION=2.1.2 \
+ THEORA_VERSION=1.1.1 \
+ VORBIS_VERSION=1.3.5 \
+ VPX_VERSION=1.8.0 \
+ WEBP_VERSION=1.0.2 \
+ X264_VERSION=20170226-2245-stable \
+ X265_VERSION=3.1.1 \
+ XAU_VERSION=1.0.9 \
+ XORG_MACROS_VERSION=1.19.2 \
+ XPROTO_VERSION=7.0.31 \
+ XVID_VERSION=1.3.4 \
+ LIBZMQ_VERSION=4.3.2 \
+ SRC=/usr/local
 
 ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz"
 ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz"
@@ -60,27 +60,27 @@ ARG PREFIX=/opt/ffmpeg
 ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64:/usr/lib64:/usr/lib:/lib64:/lib"
 
 
-RUN  buildDeps="autoconf \
-  automake \
-  cmake \
-  curl \
-  bzip2 \
-  libexpat1-dev \
-  g++ \
-  gcc \
-  git \
-  gperf \
-  libtool \
-  make \
-  nasm \
-  perl \
-  pkg-config \
-  python \
-  libssl-dev \
-  yasm \
-  libva-dev \
-  libmfx-dev \
-  zlib1g-dev" && \
+RUN buildDeps="autoconf \
+ automake \
+ cmake \
+ curl \
+ bzip2 \
+ libexpat1-dev \
+ g++ \
+ gcc \
+ git \
+ gperf \
+ libtool \
+ make \
+ nasm \
+ perl \
+ pkg-config \
+ python \
+ libssl-dev \
+ yasm \
+ libva-dev \
+ libmfx-dev \
+ zlib1g-dev" && \
  apt-get -yqq update && \
  apt-get install -yq --no-install-recommends ${buildDeps}
 ## opencore-amr https://sourceforge.net/projects/opencore-amr/
@@ -450,7 +450,7 @@ RUN \
  cp -r ${PREFIX}/include/libav* ${PREFIX}/include/libpostproc ${PREFIX}/include/libsw* /usr/local/include && \
  mkdir -p /usr/local/lib/pkgconfig && \
  for pc in ${PREFIX}/lib/pkgconfig/libav*.pc ${PREFIX}/lib/pkgconfig/libpostproc.pc ${PREFIX}/lib/pkgconfig/libsw*.pc; do \
-  sed "s:${PREFIX}:/usr/local:g" <"$pc" >/usr/local/lib/pkgconfig/"${pc##*/}"; \
+ sed "s:${PREFIX}:/usr/local:g" <"$pc" >/usr/local/lib/pkgconfig/"${pc##*/}"; \
  done
 
 FROM base AS release
@@ -463,6 +463,6 @@ ENTRYPOINT ["ffmpeg"]
 COPY --from=build /usr/local /usr/local/
 
 RUN \
- apt-get update -y && \
- apt-get install -y --no-install-recommends libva-drm2 libva2 i965-va-driver mesa-va-drivers && \
- rm -rf /var/lib/apt/lists/*
+ apt-get update -y && \
+ apt-get install -y --no-install-recommends libva-drm2 libva2 i965-va-driver mesa-va-drivers && \
+ rm -rf /var/lib/apt/lists/*