Skip to content

Commit b0fc468

Browse files
SibrasSibras
committed
Merge remote-tracking branch 'upstream/master'
2 parents b100968 + 7d0ff22 commit b0fc468

File tree

198 files changed

+266
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+266
-275
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
.*.swp
1919
.depend
2020
.DS_Store
21+
TAGS
2122
config.h
2223
config.mak
2324
config.log

‎common/aarch64/asm-offsets.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* asm-offsets.c: check asm offsets for aarch64
33
*****************************************************************************
4-
* Copyright (C) 2014-2017 x264 project
4+
* Copyright (C) 2014-2018 x264 project
55
*
66
* Authors: Janne Grunau <janne-x264@jannau.net>
77
*

‎common/aarch64/asm-offsets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* asm-offsets.h: asm offsets for aarch64
33
*****************************************************************************
4-
* Copyright (C) 2014-2017 x264 project
4+
* Copyright (C) 2014-2018 x264 project
55
*
66
* Authors: Janne Grunau <janne-x264@jannau.net>
77
*

‎common/aarch64/asm.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* asm.S: AArch64 utility macros
33
*****************************************************************************
4-
* Copyright (C) 2008-2017 x264 project
4+
* Copyright (C) 2008-2018 x264 project
55
*
66
* Authors: Mans Rullgard <mans@mansr.com>
77
* David Conrad <lessen42@gmail.com>

‎common/aarch64/bitstream-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* bitstream-a.S: aarch64 bitstream functions
33
*****************************************************************************
4-
* Copyright (C) 2014-2017 x264 project
4+
* Copyright (C) 2014-2018 x264 project
55
*
66
* Authors: Janne Grunau <janne-x264@jannau.net>
77
*

‎common/aarch64/bitstream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* bitstream.h: aarch64 bitstream functions
33
*****************************************************************************
4-
* Copyright (C) 2017 x264 project
4+
* Copyright (C) 2017-2018 x264 project
55
*
66
* Authors: Anton Mitrofanov <BugMaster@narod.ru>
77
*

‎common/aarch64/cabac-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* cabac-a.S: aarch64 cabac
33
*****************************************************************************
4-
* Copyright (C) 2014-2017 x264 project
4+
* Copyright (C) 2014-2018 x264 project
55
*
66
* Authors: Janne Grunau <janne-x264@jannau.net>
77
*

‎common/aarch64/dct-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
* dct-a.S: aarch64 transform and zigzag
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/dct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* dct.h: aarch64 transform and zigzag
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/deblock-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* deblock.S: aarch64 deblocking
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: Mans Rullgard <mans@mansr.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/deblock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* deblock.h: aarch64 deblocking
33
*****************************************************************************
4-
* Copyright (C) 2017 x264 project
4+
* Copyright (C) 2017-2018 x264 project
55
*
66
* Authors: Anton Mitrofanov <BugMaster@narod.ru>
77
*

‎common/aarch64/mc-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* mc.S: aarch64 motion compensation
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/mc-c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* mc-c.c: aarch64 motion compensation
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/mc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* mc.h: aarch64 motion compensation
33
*****************************************************************************
4-
* Copyright (C) 2014-2017 x264 project
4+
* Copyright (C) 2014-2018 x264 project
55
*
66
* Authors: Janne Grunau <janne-x264@jannau.net>
77
*

‎common/aarch64/pixel-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* pixel.S: aarch64 pixel metrics
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/pixel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* pixel.h: aarch64 pixel metrics
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/predict-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* predict.S: aarch64 intra prediction
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Mans Rullgard <mans@mansr.com>

‎common/aarch64/predict-c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* predict.c: aarch64 intra prediction
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/predict.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* predict.h: aarch64 intra prediction
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/quant-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
* quant.S: arm quantization and level-run
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/aarch64/quant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* quant.h: arm quantization and level-run
33
*****************************************************************************
4-
* Copyright (C) 2005-2017 x264 project
4+
* Copyright (C) 2005-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/arm/asm.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* asm.S: arm utility macros
33
*****************************************************************************
4-
* Copyright (C) 2008-2017 x264 project
4+
* Copyright (C) 2008-2018 x264 project
55
*
66
* Authors: Mans Rullgard <mans@mansr.com>
77
* David Conrad <lessen42@gmail.com>

‎common/arm/bitstream-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* bitstream-a.S: arm bitstream functions
33
*****************************************************************************
4-
* Copyright (C) 2014-2017 x264 project
4+
* Copyright (C) 2014-2018 x264 project
55
*
66
* Authors: Janne Grunau <janne-x264@jannau.net>
77
*

‎common/arm/bitstream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* bitstream.h: arm bitstream functions
33
*****************************************************************************
4-
* Copyright (C) 2017 x264 project
4+
* Copyright (C) 2017-2018 x264 project
55
*
66
* Authors: Anton Mitrofanov <BugMaster@narod.ru>
77
*

‎common/arm/cpu-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* cpu-a.S: arm cpu detection
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
*

‎common/arm/dct-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
* dct-a.S: arm transform and zigzag
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Martin Storsjo <martin@martin.st>

‎common/arm/dct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* dct.h: arm transform and zigzag
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
*

‎common/arm/deblock-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* deblock.S: arm deblocking
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: Mans Rullgard <mans@mansr.com>
77
* Martin Storsjo <martin@martin.st>

‎common/arm/deblock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* deblock.h: arm deblocking
33
*****************************************************************************
4-
* Copyright (C) 2017 x264 project
4+
* Copyright (C) 2017-2018 x264 project
55
*
66
* Authors: Anton Mitrofanov <BugMaster@narod.ru>
77
*

‎common/arm/mc-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* mc.S: arm motion compensation
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Mans Rullgard <mans@mansr.com>

‎common/arm/mc-c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* mc-c.c: arm motion compensation
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/arm/mc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* mc.h: arm motion compensation
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
*

‎common/arm/pixel-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* pixel.S: arm pixel metrics
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/arm/pixel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* pixel.h: arm pixel metrics
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
*

‎common/arm/predict-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* predict.S: arm intra prediction
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Mans Rullgard <mans@mansr.com>

‎common/arm/predict-c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* predict.c: arm intra prediction
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
*

‎common/arm/predict.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* predict.h: arm intra prediction
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
*

‎common/arm/quant-a.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************************
22
* quant.S: arm quantization and level-run
33
*****************************************************************************
4-
* Copyright (C) 2009-2017 x264 project
4+
* Copyright (C) 2009-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
* Janne Grunau <janne-x264@jannau.net>

‎common/arm/quant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* quant.h: arm quantization and level-run
33
*****************************************************************************
4-
* Copyright (C) 2005-2017 x264 project
4+
* Copyright (C) 2005-2018 x264 project
55
*
66
* Authors: David Conrad <lessen42@gmail.com>
77
*

‎common/base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* base.c: misc common functions (bit depth independent)
33
*****************************************************************************
4-
* Copyright (C) 2003-2017 x264 project
4+
* Copyright (C) 2003-2018 x264 project
55
*
66
* Authors: Loren Merritt <lorenm@u.washington.edu>
77
* Laurent Aimar <fenrir@via.ecp.fr>

‎common/base.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* base.h: misc common functions (bit depth independent)
33
*****************************************************************************
4-
* Copyright (C) 2003-2017 x264 project
4+
* Copyright (C) 2003-2018 x264 project
55
*
66
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
77
* Loren Merritt <lorenm@u.washington.edu>
@@ -55,7 +55,6 @@
5555
#define XCHG(type,a,b) do { type t = a; a = b; b = t; } while( 0 )
5656
#define FIX8(f) ((int)(f*(1<<8)+.5))
5757
#define ARRAY_ELEMS(a) ((sizeof(a))/(sizeof(a[0])))
58-
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
5958
#define ALIGN(x,a) (((x)+((a)-1))&~((a)-1))
6059
#define IS_DISPOSABLE(type) ( type == X264_TYPE_B )
6160

‎common/bitstream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* bitstream.c: bitstream writing
33
*****************************************************************************
4-
* Copyright (C) 2003-2017 x264 project
4+
* Copyright (C) 2003-2018 x264 project
55
*
66
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
77
* Fiona Glaser <fiona@x264.com>

‎common/bitstream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* bitstream.h: bitstream writing
33
*****************************************************************************
4-
* Copyright (C) 2003-2017 x264 project
4+
* Copyright (C) 2003-2018 x264 project
55
*
66
* Authors: Loren Merritt <lorenm@u.washington.edu>
77
* Fiona Glaser <fiona@x264.com>

0 commit comments

Comments
 (0)