.gitlab-ci.yml

@@ -81,7 +81,7 @@ stages:
 
 build-debian-amd64:
     extends: .build
-    image: registry.videolan.org/x264-debian-unstable:20190404162201
+    image: registry.videolan.org/x264-debian-unstable:20211206140856
     tags:
         - docker
         - amd64
@@ -89,7 +89,7 @@ build-debian-amd64:
 
 build-debian-aarch64:
     extends: .build
-    image: registry.videolan.org/x264-debian-unstable-aarch64:20190716192245
+    image: registry.videolan.org/x264-debian-unstable-aarch64:20211206141032
     tags:
         - docker
         - aarch64
@@ -106,7 +106,7 @@ build-debian-aarch64:
         curl -f -o vlc-contrib-${_TRIPLET}-latest.tar.bz2 ${_CONTRIB_URL}${CONTRIB_NAME}
         bunzip2 vlc-contrib-${_TRIPLET}-latest.tar.bz2
         tar xvf vlc-contrib-${_TRIPLET}-latest.tar
-        sed -i.bak -e "s#@@CONTRIB_PREFIX@@#${LOCAL_INSTALL_DIR}#g" ${PKG_CONFIG_LIBDIR}/*.pc
+        perl -pi -e "s'@@CONTRIB_PREFIX@@'$(sed -e "s/'/\\\\'/g" <<< "${LOCAL_INSTALL_DIR}")'g" ${PKG_CONFIG_LIBDIR}/*.pc
         git clone --depth 1 --branch master https://github.com/l-smash/l-smash.git lsmash
         cd lsmash
         ./configure --prefix="${LOCAL_INSTALL_DIR}" --target-os="${_TRIPLET}" --cross-prefix="${_TRIPLET}-"
@@ -126,7 +126,7 @@ build-win64:
 
 .build-llvm-mingw:
     extends: .build
-    image: registry.videolan.org/vlc-debian-llvm-mingw:20200703084018
+    image: registry.videolan.org/vlc-debian-llvm-mingw:20211020094514
     tags:
         - docker
         - amd64
@@ -154,7 +154,7 @@ build-llvm-mingw-aarch64:
         curl -f -o vlc-contrib-${_TRIPLET}-latest.tar.bz2 ${_CONTRIB_URL}${CONTRIB_NAME}
         bunzip2 vlc-contrib-${_TRIPLET}-latest.tar.bz2
         tar xvf vlc-contrib-${_TRIPLET}-latest.tar
-        sed -i.bak -e "s#@@CONTRIB_PREFIX@@#${LOCAL_INSTALL_DIR}#g" ${PKG_CONFIG_LIBDIR}/*.pc
+        perl -pi -e "s'@@CONTRIB_PREFIX@@'$(sed -e "s/'/\\\\'/g" <<< "${LOCAL_INSTALL_DIR}")'g" ${PKG_CONFIG_LIBDIR}/*.pc
         git clone --depth 1 --branch master https://github.com/l-smash/l-smash.git lsmash
         cd lsmash
         ./configure --prefix="${LOCAL_INSTALL_DIR}" --target-os="${_TRIPLET}" --extra-cflags="${_XCFLAGS}" --extra-ldflags="${_XLDFLAGS}"

AUTHORS

@@ -58,7 +58,7 @@ S: Sweden
 N: Laurent Aimar
 E: fenrir AT videolan DOT org
 C: fenrir
-D: Intial import, former maintainer
+D: Initial import, former maintainer
 D: x86 asm (mmx/mmx2)
 S: France
 

Makefile

@@ -391,7 +391,8 @@ install-cli: cli
 	$(INSTALL) x264$(EXE) $(DESTDIR)$(bindir)
 
 install-lib-dev:
-	$(INSTALL) -d $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL) -d $(DESTDIR)$(includedir)
+	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
 	$(INSTALL) -m 644 $(SRCPATH)/x264.h x264_config.h $(DESTDIR)$(includedir)
 	$(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
 

autocomplete.c

 /*****************************************************************************
  * autocomplete: x264cli shell autocomplete
  *****************************************************************************
- * Copyright (C) 2018-2021 x264 project
+ * Copyright (C) 2018-2022 x264 project
  *
  * Authors: Henrik Gramner <henrik@gramner.com>
  *

common/aarch64/asm-offsets.c

 /*****************************************************************************
  * asm-offsets.c: check asm offsets for aarch64
  *****************************************************************************
- * Copyright (C) 2014-2021 x264 project
+ * Copyright (C) 2014-2022 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

common/aarch64/asm-offsets.h

 /*****************************************************************************
  * asm-offsets.h: asm offsets for aarch64
  *****************************************************************************
- * Copyright (C) 2014-2021 x264 project
+ * Copyright (C) 2014-2022 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

common/aarch64/asm.S

 /*****************************************************************************
  * asm.S: AArch64 utility macros
  *****************************************************************************
- * Copyright (C) 2008-2021 x264 project
+ * Copyright (C) 2008-2022 x264 project
  *
  * Authors: Mans Rullgard <mans@mansr.com>
  *          David Conrad <lessen42@gmail.com>

common/aarch64/bitstream-a.S

 /*****************************************************************************
  * bitstream-a.S: aarch64 bitstream functions
  *****************************************************************************
- * Copyright (C) 2014-2021 x264 project
+ * Copyright (C) 2014-2022 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

common/aarch64/bitstream.h

 /*****************************************************************************
  * bitstream.h: aarch64 bitstream functions
  *****************************************************************************
- * Copyright (C) 2017-2021 x264 project
+ * Copyright (C) 2017-2022 x264 project
  *
  * Authors: Anton Mitrofanov <BugMaster@narod.ru>
  *

common/aarch64/cabac-a.S

 /*****************************************************************************
  * cabac-a.S: aarch64 cabac
  *****************************************************************************
- * Copyright (C) 2014-2021 x264 project
+ * Copyright (C) 2014-2022 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

common/aarch64/dct-a.S

 /****************************************************************************
  * dct-a.S: aarch64 transform and zigzag
  *****************************************************************************
- * Copyright (C) 2009-2021 x264 project
+ * Copyright (C) 2009-2022 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>

common/aarch64/dct.h

 /*****************************************************************************
  * dct.h: aarch64 transform and zigzag
  *****************************************************************************
- * Copyright (C) 2009-2021 x264 project
+ * Copyright (C) 2009-2022 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>

common/aarch64/deblock-a.S

 /*****************************************************************************
  * deblock.S: aarch64 deblocking
  *****************************************************************************
- * Copyright (C) 2009-2021 x264 project
+ * Copyright (C) 2009-2022 x264 project
  *
  * Authors: Mans Rullgard <mans@mansr.com>
  *          Janne Grunau <janne-x264@jannau.net>

common/aarch64/deblock.h

 /*****************************************************************************
  * deblock.h: aarch64 deblocking
  *****************************************************************************
- * Copyright (C) 2017-2021 x264 project
+ * Copyright (C) 2017-2022 x264 project
  *
  * Authors: Anton Mitrofanov <BugMaster@narod.ru>
  *

common/aarch64/mc-a.S

 /*****************************************************************************
  * mc.S: aarch64 motion compensation
  *****************************************************************************
- * Copyright (C) 2009-2021 x264 project
+ * Copyright (C) 2009-2022 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>

common/aarch64/mc-c.c

 /*****************************************************************************
  * mc-c.c: aarch64 motion compensation
  *****************************************************************************
- * Copyright (C) 2009-2021 x264 project
+ * Copyright (C) 2009-2022 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>
@@ -210,7 +210,7 @@ static void mc_luma_neon( uint8_t *dst,    intptr_t i_dst_stride,
     int qpel_idx = ((mvy&3)<<2) + (mvx&3);
     intptr_t offset = (mvy>>2)*i_src_stride + (mvx>>2);
     uint8_t *src1 = src[x264_hpel_ref0[qpel_idx]] + offset;
-    if( (mvy&3) == 3 )             // explict if() to force conditional add
+    if( (mvy&3) == 3 )             // explicit if() to force conditional add
         src1 += i_src_stride;
 
     if( qpel_idx & 5 ) /* qpel interpolation needed */
@@ -236,7 +236,7 @@ static uint8_t *get_ref_neon( uint8_t *dst,   intptr_t *i_dst_stride,
     int qpel_idx = ((mvy&3)<<2) + (mvx&3);
     intptr_t offset = (mvy>>2)*i_src_stride + (mvx>>2);
     uint8_t *src1 = src[x264_hpel_ref0[qpel_idx]] + offset;
-    if( (mvy&3) == 3 )             // explict if() to force conditional add
+    if( (mvy&3) == 3 )             // explicit if() to force conditional add
         src1 += i_src_stride;
 
     if( qpel_idx & 5 ) /* qpel interpolation needed */

common/aarch64/mc.h

 /*****************************************************************************
  * mc.h: aarch64 motion compensation
  *****************************************************************************
- * Copyright (C) 2014-2021 x264 project
+ * Copyright (C) 2014-2022 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

common/aarch64/pixel-a.S

 /*****************************************************************************
  * pixel.S: aarch64 pixel metrics
  *****************************************************************************
- * Copyright (C) 2009-2021 x264 project
+ * Copyright (C) 2009-2022 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>

common/aarch64/pixel.h

 /*****************************************************************************
  * pixel.h: aarch64 pixel metrics
  *****************************************************************************
- * Copyright (C) 2009-2021 x264 project
+ * Copyright (C) 2009-2022 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>

common/aarch64/predict-a.S

 /*****************************************************************************
  * predict.S: aarch64 intra prediction
  *****************************************************************************
- * Copyright (C) 2009-2021 x264 project
+ * Copyright (C) 2009-2022 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Mans Rullgard <mans@mansr.com>