From: Henrik Gramner Date: Sun, 5 Jan 2014 14:25:05 +0000 (+0100) Subject: Bump dates to 2014 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=807aeaaae7351e4c2c536463e69dacaac218bccb;p=libx264 Bump dates to 2014 Also update AUTHORS file and my e-mail address in the headers of various files. --- diff --git a/AUTHORS b/AUTHORS index 680987b5..b0e8524c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,8 +43,8 @@ D: Altivec optimizations S: Brittany, France N: Henrik Gramner -E: hengar-6 AT student DOT ltu DOT se -D: 4:2:2 chroma subsampling, x86 asm +E: henrik AT gramner DOT com +D: 4:2:2 chroma subsampling, x86 asm, Windows improvements, bugfixes S: Sweden N: Fiona Glaser diff --git a/common/arm/asm.S b/common/arm/asm.S index 43d7259c..77cc005f 100644 --- a/common/arm/asm.S +++ b/common/arm/asm.S @@ -1,7 +1,7 @@ /***************************************************************************** * asm.S: arm utility macros ***************************************************************************** - * Copyright (C) 2008-2013 x264 project + * Copyright (C) 2008-2014 x264 project * * Authors: Mans Rullgard * David Conrad diff --git a/common/arm/cpu-a.S b/common/arm/cpu-a.S index 3d9cca9d..a254551a 100644 --- a/common/arm/cpu-a.S +++ b/common/arm/cpu-a.S @@ -1,7 +1,7 @@ /***************************************************************************** * cpu-a.S: arm cpu detection ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/dct-a.S b/common/arm/dct-a.S index 1b188e91..df12aeb0 100644 --- a/common/arm/dct-a.S +++ b/common/arm/dct-a.S @@ -1,7 +1,7 @@ /**************************************************************************** * dct-a.S: arm transform and zigzag ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/dct.h b/common/arm/dct.h index 4defc32a..8a683f23 100644 --- a/common/arm/dct.h +++ b/common/arm/dct.h @@ -1,7 +1,7 @@ /***************************************************************************** * dct.h: arm transform and zigzag ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/deblock-a.S b/common/arm/deblock-a.S index f0e7f4d0..7cfecb7e 100644 --- a/common/arm/deblock-a.S +++ b/common/arm/deblock-a.S @@ -1,7 +1,7 @@ /***************************************************************************** * deblock.S: arm deblocking ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: Mans Rullgard * diff --git a/common/arm/mc-a.S b/common/arm/mc-a.S index 6e84e3cd..90f16116 100644 --- a/common/arm/mc-a.S +++ b/common/arm/mc-a.S @@ -1,7 +1,7 @@ /***************************************************************************** * mc.S: arm motion compensation ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * Mans Rullgard diff --git a/common/arm/mc-c.c b/common/arm/mc-c.c index 2168120f..16ea1c5f 100644 --- a/common/arm/mc-c.c +++ b/common/arm/mc-c.c @@ -1,7 +1,7 @@ /***************************************************************************** * mc-c.c: arm motion compensation ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/mc.h b/common/arm/mc.h index 8823a53d..f8922ea6 100644 --- a/common/arm/mc.h +++ b/common/arm/mc.h @@ -1,7 +1,7 @@ /***************************************************************************** * mc.h: arm motion compensation ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/pixel-a.S b/common/arm/pixel-a.S index 717a771f..644e4497 100644 --- a/common/arm/pixel-a.S +++ b/common/arm/pixel-a.S @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.S: arm pixel metrics ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/pixel.h b/common/arm/pixel.h index 7d042473..1024ee78 100644 --- a/common/arm/pixel.h +++ b/common/arm/pixel.h @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: arm pixel metrics ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/predict-a.S b/common/arm/predict-a.S index c2bf0817..ed805b5c 100644 --- a/common/arm/predict-a.S +++ b/common/arm/predict-a.S @@ -1,7 +1,7 @@ /***************************************************************************** * predict.S: arm intra prediction ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * Mans Rullgard diff --git a/common/arm/predict-c.c b/common/arm/predict-c.c index 07a46fac..204051b0 100644 --- a/common/arm/predict-c.c +++ b/common/arm/predict-c.c @@ -1,7 +1,7 @@ /***************************************************************************** * predict.c: arm intra prediction ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/predict.h b/common/arm/predict.h index e6e13fa1..0d07c2a2 100644 --- a/common/arm/predict.h +++ b/common/arm/predict.h @@ -1,7 +1,7 @@ /***************************************************************************** * predict.h: arm intra prediction ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/quant-a.S b/common/arm/quant-a.S index 38045bc6..2aeedc4a 100644 --- a/common/arm/quant-a.S +++ b/common/arm/quant-a.S @@ -1,7 +1,7 @@ /**************************************************************************** * quant.S: arm quantization and level-run ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: David Conrad * diff --git a/common/arm/quant.h b/common/arm/quant.h index bf29f251..0695ab1e 100644 --- a/common/arm/quant.h +++ b/common/arm/quant.h @@ -1,7 +1,7 @@ /***************************************************************************** * quant.h: arm quantization and level-run ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: David Conrad * diff --git a/common/bitstream.c b/common/bitstream.c index 2c2ca37f..ed3ad5e1 100644 --- a/common/bitstream.c +++ b/common/bitstream.c @@ -1,7 +1,7 @@ /***************************************************************************** * bitstream.c: bitstream writing ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Fiona Glaser diff --git a/common/bitstream.h b/common/bitstream.h index 629cf607..83a6b1d5 100644 --- a/common/bitstream.h +++ b/common/bitstream.h @@ -1,7 +1,7 @@ /***************************************************************************** * bitstream.h: bitstream writing ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Fiona Glaser diff --git a/common/cabac.c b/common/cabac.c index a796bb1f..3dbc5743 100644 --- a/common/cabac.c +++ b/common/cabac.c @@ -1,7 +1,7 @@ /***************************************************************************** * cabac.c: arithmetic coder ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/cabac.h b/common/cabac.h index ccf4d4e8..dbe68206 100644 --- a/common/cabac.h +++ b/common/cabac.h @@ -1,7 +1,7 @@ /***************************************************************************** * cabac.h: arithmetic coder ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/common.c b/common/common.c index f24890f9..4cdde07c 100644 --- a/common/common.c +++ b/common/common.c @@ -1,7 +1,7 @@ /***************************************************************************** * common.c: misc common functions ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/common.h b/common/common.h index d18b715e..6e63170f 100644 --- a/common/common.h +++ b/common/common.h @@ -1,7 +1,7 @@ /***************************************************************************** * common.h: misc common functions ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/cpu.c b/common/cpu.c index 0e36a89f..3f607665 100644 --- a/common/cpu.c +++ b/common/cpu.c @@ -1,7 +1,7 @@ /***************************************************************************** * cpu.c: cpu detection ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/cpu.h b/common/cpu.h index 06b45d37..158e102e 100644 --- a/common/cpu.h +++ b/common/cpu.h @@ -1,7 +1,7 @@ /***************************************************************************** * cpu.h: cpu detection ***************************************************************************** - * Copyright (C) 2004-2013 x264 project + * Copyright (C) 2004-2014 x264 project * * Authors: Loren Merritt * diff --git a/common/dct.c b/common/dct.c index 52ef9bef..9cca355f 100644 --- a/common/dct.c +++ b/common/dct.c @@ -1,11 +1,11 @@ /***************************************************************************** * dct.c: transform and zigzag ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar - * Henrik Gramner + * Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/common/dct.h b/common/dct.h index ce10eb21..7aef8256 100644 --- a/common/dct.h +++ b/common/dct.h @@ -1,7 +1,7 @@ /***************************************************************************** * dct.h: transform and zigzag ***************************************************************************** - * Copyright (C) 2004-2013 x264 project + * Copyright (C) 2004-2014 x264 project * * Authors: Loren Merritt * diff --git a/common/deblock.c b/common/deblock.c index a00847ef..e6af417f 100644 --- a/common/deblock.c +++ b/common/deblock.c @@ -1,12 +1,12 @@ /***************************************************************************** * deblock.c: deblocking ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt * Fiona Glaser - * Henrik Gramner + * Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/common/frame.c b/common/frame.c index 6203e3bf..7e79fe9a 100644 --- a/common/frame.c +++ b/common/frame.c @@ -1,7 +1,7 @@ /***************************************************************************** * frame.c: frame handling ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/frame.h b/common/frame.h index d8416a5d..f95ffa99 100644 --- a/common/frame.h +++ b/common/frame.h @@ -1,7 +1,7 @@ /***************************************************************************** * frame.h: frame handling ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/macroblock.c b/common/macroblock.c index 45405fde..bf5a0e82 100644 --- a/common/macroblock.c +++ b/common/macroblock.c @@ -1,12 +1,12 @@ /***************************************************************************** * macroblock.c: macroblock common functions ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Fiona Glaser * Laurent Aimar * Loren Merritt - * Henrik Gramner + * Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/common/macroblock.h b/common/macroblock.h index 7805e497..2fe31632 100644 --- a/common/macroblock.h +++ b/common/macroblock.h @@ -1,7 +1,7 @@ /***************************************************************************** * macroblock.h: macroblock common functions ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/mc.c b/common/mc.c index 68104840..0fe0e61a 100644 --- a/common/mc.c +++ b/common/mc.c @@ -1,7 +1,7 @@ /***************************************************************************** * mc.c: motion compensation ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/mc.h b/common/mc.h index 262e2016..edd3e327 100644 --- a/common/mc.h +++ b/common/mc.h @@ -1,7 +1,7 @@ /***************************************************************************** * mc.h: motion compensation ***************************************************************************** - * Copyright (C) 2004-2013 x264 project + * Copyright (C) 2004-2014 x264 project * * Authors: Loren Merritt * diff --git a/common/mvpred.c b/common/mvpred.c index 4cde5ad5..745c8ea0 100644 --- a/common/mvpred.c +++ b/common/mvpred.c @@ -1,7 +1,7 @@ /***************************************************************************** * mvpred.c: motion vector prediction ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Fiona Glaser diff --git a/common/opencl.c b/common/opencl.c index 5d0dce50..9e5e7941 100644 --- a/common/opencl.c +++ b/common/opencl.c @@ -1,7 +1,7 @@ /***************************************************************************** * opencl.c: OpenCL initialization and kernel compilation ***************************************************************************** - * Copyright (C) 2012-2013 x264 project + * Copyright (C) 2012-2014 x264 project * * Authors: Steve Borho * Anton Mitrofanov diff --git a/common/opencl.h b/common/opencl.h index 426bf140..05129b07 100644 --- a/common/opencl.h +++ b/common/opencl.h @@ -1,7 +1,7 @@ /***************************************************************************** * opencl.h: OpenCL structures and defines ***************************************************************************** - * Copyright (C) 2012-2013 x264 project + * Copyright (C) 2012-2014 x264 project * * Authors: Steve Borho * Anton Mitrofanov diff --git a/common/osdep.c b/common/osdep.c index bc3692a1..e97aaeda 100644 --- a/common/osdep.c +++ b/common/osdep.c @@ -1,7 +1,7 @@ /***************************************************************************** * osdep.c: platform-specific code ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Steven Walters * Laurent Aimar diff --git a/common/osdep.h b/common/osdep.h index ea6eb085..28a2e85f 100644 --- a/common/osdep.h +++ b/common/osdep.h @@ -1,7 +1,7 @@ /***************************************************************************** * osdep.h: platform-specific code ***************************************************************************** - * Copyright (C) 2007-2013 x264 project + * Copyright (C) 2007-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/pixel.c b/common/pixel.c index ff881ac6..54ada1ea 100644 --- a/common/pixel.c +++ b/common/pixel.c @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.c: pixel metrics ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/pixel.h b/common/pixel.h index 4fef644a..df480b09 100644 --- a/common/pixel.h +++ b/common/pixel.h @@ -1,11 +1,11 @@ /***************************************************************************** * pixel.c: pixel metrics ***************************************************************************** - * Copyright (C) 2004-2013 x264 project + * Copyright (C) 2004-2014 x264 project * * Authors: Loren Merritt * Fiona Glaser - Henrik Gramner + Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/common/ppc/dct.c b/common/ppc/dct.c index 8420ad21..b3c3b2c2 100644 --- a/common/ppc/dct.c +++ b/common/ppc/dct.c @@ -1,7 +1,7 @@ /***************************************************************************** * dct.c: ppc transform and zigzag ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Guillaume Poirier * Eric Petit diff --git a/common/ppc/dct.h b/common/ppc/dct.h index 3ac841a9..f04de1f5 100644 --- a/common/ppc/dct.h +++ b/common/ppc/dct.h @@ -1,7 +1,7 @@ /***************************************************************************** * dct.h: ppc transform and zigzag ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Eric Petit * Guillaume Poirier diff --git a/common/ppc/deblock.c b/common/ppc/deblock.c index bddd2e41..423e9b49 100644 --- a/common/ppc/deblock.c +++ b/common/ppc/deblock.c @@ -1,7 +1,7 @@ /***************************************************************************** * deblock.c: ppc deblocking ***************************************************************************** - * Copyright (C) 2007-2013 x264 project + * Copyright (C) 2007-2014 x264 project * * Authors: Guillaume Poirier * diff --git a/common/ppc/mc.c b/common/ppc/mc.c index 437c7d06..9d554feb 100644 --- a/common/ppc/mc.c +++ b/common/ppc/mc.c @@ -1,7 +1,7 @@ /***************************************************************************** * mc.c: ppc motion compensation ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Eric Petit * Guillaume Poirier diff --git a/common/ppc/mc.h b/common/ppc/mc.h index a996ae7b..4b77f016 100644 --- a/common/ppc/mc.h +++ b/common/ppc/mc.h @@ -1,7 +1,7 @@ /***************************************************************************** * mc.h: ppc motion compensation ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Eric Petit * diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c index 4d322843..46a3a49c 100644 --- a/common/ppc/pixel.c +++ b/common/ppc/pixel.c @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.c: ppc pixel metrics ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Eric Petit * Guillaume Poirier diff --git a/common/ppc/pixel.h b/common/ppc/pixel.h index 62e8cfc4..7ad1ac7c 100644 --- a/common/ppc/pixel.h +++ b/common/ppc/pixel.h @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: ppc pixel metrics ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Eric Petit * diff --git a/common/ppc/ppccommon.h b/common/ppc/ppccommon.h index f88d3608..1a79bd5d 100644 --- a/common/ppc/ppccommon.h +++ b/common/ppc/ppccommon.h @@ -1,7 +1,7 @@ /***************************************************************************** * ppccommon.h: ppc utility macros ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Eric Petit * diff --git a/common/ppc/predict.c b/common/ppc/predict.c index 69fe2224..e75f9e9c 100644 --- a/common/ppc/predict.c +++ b/common/ppc/predict.c @@ -1,7 +1,7 @@ /***************************************************************************** * predict.c: ppc intra prediction ***************************************************************************** - * Copyright (C) 2007-2013 x264 project + * Copyright (C) 2007-2014 x264 project * * Authors: Guillaume Poirier * diff --git a/common/ppc/predict.h b/common/ppc/predict.h index 9082ca55..cff17562 100644 --- a/common/ppc/predict.h +++ b/common/ppc/predict.h @@ -1,7 +1,7 @@ /***************************************************************************** * predict.h: ppc intra prediction ***************************************************************************** - * Copyright (C) 2007-2013 x264 project + * Copyright (C) 2007-2014 x264 project * * Authors: Guillaume Poirier * diff --git a/common/ppc/quant.c b/common/ppc/quant.c index f11938af..15094872 100644 --- a/common/ppc/quant.c +++ b/common/ppc/quant.c @@ -1,7 +1,7 @@ /***************************************************************************** * quant.c: ppc quantization ***************************************************************************** - * Copyright (C) 2007-2013 x264 project + * Copyright (C) 2007-2014 x264 project * * Authors: Guillaume Poirier * diff --git a/common/ppc/quant.h b/common/ppc/quant.h index 1f789c35..6bdf2a44 100644 --- a/common/ppc/quant.h +++ b/common/ppc/quant.h @@ -1,7 +1,7 @@ /***************************************************************************** * quant.c: ppc quantization ***************************************************************************** - * Copyright (C) 2007-2013 x264 project + * Copyright (C) 2007-2014 x264 project * * Authors: Guillaume Poirier * diff --git a/common/predict.c b/common/predict.c index caa72f01..cbc018d3 100644 --- a/common/predict.c +++ b/common/predict.c @@ -1,12 +1,12 @@ /***************************************************************************** * predict.c: intra prediction ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt * Fiona Glaser - * Henrik Gramner + * Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/common/predict.h b/common/predict.h index 957c3aba..b01dcbd5 100644 --- a/common/predict.h +++ b/common/predict.h @@ -1,7 +1,7 @@ /***************************************************************************** * predict.h: intra prediction ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/quant.c b/common/quant.c index bb87d70a..339df1c1 100644 --- a/common/quant.c +++ b/common/quant.c @@ -1,12 +1,12 @@ /***************************************************************************** * quant.c: quantization and level-run ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Loren Merritt * Fiona Glaser * Christian Heine - * Henrik Gramner + * Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/common/quant.h b/common/quant.h index ee80aeb6..ae597ef8 100644 --- a/common/quant.h +++ b/common/quant.h @@ -1,7 +1,7 @@ /***************************************************************************** * quant.h: quantization and level-run ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Loren Merritt * Fiona Glaser diff --git a/common/rectangle.c b/common/rectangle.c index 623e9e1d..f53f6525 100644 --- a/common/rectangle.c +++ b/common/rectangle.c @@ -1,7 +1,7 @@ /***************************************************************************** * rectangle.c: rectangle filling ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Fiona Glaser * diff --git a/common/rectangle.h b/common/rectangle.h index ef83ad31..fe81dd9a 100644 --- a/common/rectangle.h +++ b/common/rectangle.h @@ -1,7 +1,7 @@ /***************************************************************************** * rectangle.h: rectangle filling ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Fiona Glaser * Loren Merritt diff --git a/common/set.c b/common/set.c index fa8b1585..53c61ca1 100644 --- a/common/set.c +++ b/common/set.c @@ -1,7 +1,7 @@ /***************************************************************************** * set.c: quantization init ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Loren Merritt * diff --git a/common/set.h b/common/set.h index 2bb11fc4..6fb7abaf 100644 --- a/common/set.h +++ b/common/set.h @@ -1,7 +1,7 @@ /***************************************************************************** * set.h: quantization init ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/sparc/pixel.asm b/common/sparc/pixel.asm index ba21273c..d87d7fe5 100644 --- a/common/sparc/pixel.asm +++ b/common/sparc/pixel.asm @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.asm: sparc pixel metrics ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Phil Jensen * diff --git a/common/sparc/pixel.h b/common/sparc/pixel.h index 600b05d5..ed60b62c 100644 --- a/common/sparc/pixel.h +++ b/common/sparc/pixel.h @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: sparc pixel metrics ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Phil Jensen * diff --git a/common/threadpool.c b/common/threadpool.c index 303349a4..6c44cc86 100644 --- a/common/threadpool.c +++ b/common/threadpool.c @@ -1,7 +1,7 @@ /***************************************************************************** * threadpool.c: thread pooling ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/common/threadpool.h b/common/threadpool.h index 2941458b..b2a00c12 100644 --- a/common/threadpool.h +++ b/common/threadpool.h @@ -1,7 +1,7 @@ /***************************************************************************** * threadpool.h: thread pooling ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/common/vlc.c b/common/vlc.c index b070bd7e..1edf1051 100644 --- a/common/vlc.c +++ b/common/vlc.c @@ -1,11 +1,11 @@ /***************************************************************************** * vlc.c : vlc tables ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Fiona Glaser - * Henrik Gramner + * Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/common/win32thread.c b/common/win32thread.c index b446b76c..7ad70edc 100644 --- a/common/win32thread.c +++ b/common/win32thread.c @@ -1,7 +1,7 @@ /***************************************************************************** * win32thread.c: windows threading ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * Pegasys Inc. diff --git a/common/win32thread.h b/common/win32thread.h index 48494d51..c5130a18 100644 --- a/common/win32thread.h +++ b/common/win32thread.h @@ -1,7 +1,7 @@ /***************************************************************************** * win32thread.h: windows threading ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/common/x86/bitstream-a.asm b/common/x86/bitstream-a.asm index 8aff5069..1ff0348b 100644 --- a/common/x86/bitstream-a.asm +++ b/common/x86/bitstream-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* bitstream-a.asm: x86 bitstream functions ;***************************************************************************** -;* Copyright (C) 2010-2013 x264 project +;* Copyright (C) 2010-2014 x264 project ;* ;* Authors: Fiona Glaser ;* Henrik Gramner diff --git a/common/x86/cabac-a.asm b/common/x86/cabac-a.asm index 790edf1e..2d7d5519 100644 --- a/common/x86/cabac-a.asm +++ b/common/x86/cabac-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* cabac-a.asm: x86 cabac ;***************************************************************************** -;* Copyright (C) 2008-2013 x264 project +;* Copyright (C) 2008-2014 x264 project ;* ;* Authors: Loren Merritt ;* Fiona Glaser diff --git a/common/x86/const-a.asm b/common/x86/const-a.asm index ae41c5b0..fafe567d 100644 --- a/common/x86/const-a.asm +++ b/common/x86/const-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* const-a.asm: x86 global constants ;***************************************************************************** -;* Copyright (C) 2010-2013 x264 project +;* Copyright (C) 2010-2014 x264 project ;* ;* Authors: Loren Merritt ;* Fiona Glaser diff --git a/common/x86/cpu-a.asm b/common/x86/cpu-a.asm index 2ff86e75..bcf6c434 100644 --- a/common/x86/cpu-a.asm +++ b/common/x86/cpu-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* cpu-a.asm: x86 cpu utilities ;***************************************************************************** -;* Copyright (C) 2003-2013 x264 project +;* Copyright (C) 2003-2014 x264 project ;* ;* Authors: Laurent Aimar ;* Loren Merritt diff --git a/common/x86/dct-32.asm b/common/x86/dct-32.asm index 70c7fb57..be2786f1 100644 --- a/common/x86/dct-32.asm +++ b/common/x86/dct-32.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* dct-32.asm: x86_32 transform and zigzag ;***************************************************************************** -;* Copyright (C) 2003-2013 x264 project +;* Copyright (C) 2003-2014 x264 project ;* ;* Authors: Loren Merritt ;* Holger Lubitz diff --git a/common/x86/dct-64.asm b/common/x86/dct-64.asm index c1aff843..ac20e99f 100644 --- a/common/x86/dct-64.asm +++ b/common/x86/dct-64.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* dct-64.asm: x86_64 transform and zigzag ;***************************************************************************** -;* Copyright (C) 2003-2013 x264 project +;* Copyright (C) 2003-2014 x264 project ;* ;* Authors: Loren Merritt ;* Holger Lubitz diff --git a/common/x86/dct-a.asm b/common/x86/dct-a.asm index ab6e10b4..4c594acc 100644 --- a/common/x86/dct-a.asm +++ b/common/x86/dct-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* dct-a.asm: x86 transform and zigzag ;***************************************************************************** -;* Copyright (C) 2003-2013 x264 project +;* Copyright (C) 2003-2014 x264 project ;* ;* Authors: Holger Lubitz ;* Loren Merritt diff --git a/common/x86/dct.h b/common/x86/dct.h index 0a8ef374..337a6327 100644 --- a/common/x86/dct.h +++ b/common/x86/dct.h @@ -1,7 +1,7 @@ /***************************************************************************** * dct.h: x86 transform and zigzag ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/x86/deblock-a.asm b/common/x86/deblock-a.asm index 75cb9e1d..a9b719c6 100644 --- a/common/x86/deblock-a.asm +++ b/common/x86/deblock-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* deblock-a.asm: x86 deblocking ;***************************************************************************** -;* Copyright (C) 2005-2013 x264 project +;* Copyright (C) 2005-2014 x264 project ;* ;* Authors: Loren Merritt ;* Fiona Glaser diff --git a/common/x86/mc-a.asm b/common/x86/mc-a.asm index f8d66a45..f60e69ea 100644 --- a/common/x86/mc-a.asm +++ b/common/x86/mc-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* mc-a.asm: x86 motion compensation ;***************************************************************************** -;* Copyright (C) 2003-2013 x264 project +;* Copyright (C) 2003-2014 x264 project ;* ;* Authors: Loren Merritt ;* Fiona Glaser diff --git a/common/x86/mc-a2.asm b/common/x86/mc-a2.asm index 0b97f237..39b83555 100644 --- a/common/x86/mc-a2.asm +++ b/common/x86/mc-a2.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* mc-a2.asm: x86 motion compensation ;***************************************************************************** -;* Copyright (C) 2005-2013 x264 project +;* Copyright (C) 2005-2014 x264 project ;* ;* Authors: Loren Merritt ;* Fiona Glaser diff --git a/common/x86/mc-c.c b/common/x86/mc-c.c index ffc2ca86..cbe2d3ac 100644 --- a/common/x86/mc-c.c +++ b/common/x86/mc-c.c @@ -1,7 +1,7 @@ /***************************************************************************** * mc-c.c: x86 motion compensation ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/x86/mc.h b/common/x86/mc.h index 4287f6d0..c9e56344 100644 --- a/common/x86/mc.h +++ b/common/x86/mc.h @@ -1,7 +1,7 @@ /***************************************************************************** * mc.h: x86 motion compensation ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/common/x86/pixel-32.asm b/common/x86/pixel-32.asm index 58324bf8..f25bb67a 100644 --- a/common/x86/pixel-32.asm +++ b/common/x86/pixel-32.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* pixel-32.asm: x86_32 pixel metrics ;***************************************************************************** -;* Copyright (C) 2003-2013 x264 project +;* Copyright (C) 2003-2014 x264 project ;* ;* Authors: Loren Merritt ;* Laurent Aimar diff --git a/common/x86/pixel-a.asm b/common/x86/pixel-a.asm index 748ecf92..421675e7 100644 --- a/common/x86/pixel-a.asm +++ b/common/x86/pixel-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* pixel.asm: x86 pixel metrics ;***************************************************************************** -;* Copyright (C) 2003-2013 x264 project +;* Copyright (C) 2003-2014 x264 project ;* ;* Authors: Loren Merritt ;* Holger Lubitz diff --git a/common/x86/pixel.h b/common/x86/pixel.h index 0f3524cb..362bc30c 100644 --- a/common/x86/pixel.h +++ b/common/x86/pixel.h @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: x86 pixel metrics ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/x86/predict-a.asm b/common/x86/predict-a.asm index 9dae4a87..c0fabfa8 100644 --- a/common/x86/predict-a.asm +++ b/common/x86/predict-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* predict-a.asm: x86 intra prediction ;***************************************************************************** -;* Copyright (C) 2005-2013 x264 project +;* Copyright (C) 2005-2014 x264 project ;* ;* Authors: Loren Merritt ;* Holger Lubitz diff --git a/common/x86/predict-c.c b/common/x86/predict-c.c index 59fda581..086c45dc 100644 --- a/common/x86/predict-c.c +++ b/common/x86/predict-c.c @@ -1,7 +1,7 @@ /***************************************************************************** * predict-c.c: intra prediction ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/x86/predict.h b/common/x86/predict.h index 25ba25dd..187fb68f 100644 --- a/common/x86/predict.h +++ b/common/x86/predict.h @@ -1,7 +1,7 @@ /***************************************************************************** * predict.h: x86 intra prediction ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/common/x86/quant-a.asm b/common/x86/quant-a.asm index def485ee..ed01c372 100644 --- a/common/x86/quant-a.asm +++ b/common/x86/quant-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* quant-a.asm: x86 quantization and level-run ;***************************************************************************** -;* Copyright (C) 2005-2013 x264 project +;* Copyright (C) 2005-2014 x264 project ;* ;* Authors: Loren Merritt ;* Fiona Glaser diff --git a/common/x86/quant.h b/common/x86/quant.h index 089942ad..5adc6877 100644 --- a/common/x86/quant.h +++ b/common/x86/quant.h @@ -1,7 +1,7 @@ /***************************************************************************** * quant.h: x86 quantization and level-run ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Loren Merritt * Fiona Glaser diff --git a/common/x86/sad-a.asm b/common/x86/sad-a.asm index 2270011b..7744ab35 100644 --- a/common/x86/sad-a.asm +++ b/common/x86/sad-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* sad-a.asm: x86 sad functions ;***************************************************************************** -;* Copyright (C) 2003-2013 x264 project +;* Copyright (C) 2003-2014 x264 project ;* ;* Authors: Loren Merritt ;* Fiona Glaser diff --git a/common/x86/sad16-a.asm b/common/x86/sad16-a.asm index 68fa06ae..ebfe9b5c 100644 --- a/common/x86/sad16-a.asm +++ b/common/x86/sad16-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* sad16-a.asm: x86 high depth sad functions ;***************************************************************************** -;* Copyright (C) 2010-2013 x264 project +;* Copyright (C) 2010-2014 x264 project ;* ;* Authors: Oskar Arvidsson ;* Henrik Gramner diff --git a/common/x86/trellis-64.asm b/common/x86/trellis-64.asm index bd3e803c..4fbe9e92 100644 --- a/common/x86/trellis-64.asm +++ b/common/x86/trellis-64.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* trellis-64.asm: x86_64 trellis quantization ;***************************************************************************** -;* Copyright (C) 2012-2013 x264 project +;* Copyright (C) 2012-2014 x264 project ;* ;* Authors: Loren Merritt ;* diff --git a/common/x86/util.h b/common/x86/util.h index 972f0de9..6aa42336 100644 --- a/common/x86/util.h +++ b/common/x86/util.h @@ -1,7 +1,7 @@ /***************************************************************************** * util.h: x86 inline asm ***************************************************************************** - * Copyright (C) 2008-2013 x264 project + * Copyright (C) 2008-2014 x264 project * * Authors: Fiona Glaser * Loren Merritt diff --git a/common/x86/x86inc.asm b/common/x86/x86inc.asm index 1696a4c9..4dae43a2 100644 --- a/common/x86/x86inc.asm +++ b/common/x86/x86inc.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* x86inc.asm: x264asm abstraction layer ;***************************************************************************** -;* Copyright (C) 2005-2013 x264 project +;* Copyright (C) 2005-2014 x264 project ;* ;* Authors: Loren Merritt ;* Anton Mitrofanov diff --git a/common/x86/x86util.asm b/common/x86/x86util.asm index 8a5365e0..79ff34f3 100644 --- a/common/x86/x86util.asm +++ b/common/x86/x86util.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* x86util.asm: x86 utility macros ;***************************************************************************** -;* Copyright (C) 2008-2013 x264 project +;* Copyright (C) 2008-2014 x264 project ;* ;* Authors: Holger Lubitz ;* Loren Merritt diff --git a/encoder/analyse.c b/encoder/analyse.c index 3796afb2..0e8a280f 100644 --- a/encoder/analyse.c +++ b/encoder/analyse.c @@ -1,7 +1,7 @@ /***************************************************************************** * analyse.c: macroblock analysis ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/encoder/analyse.h b/encoder/analyse.h index cbbb0dfa..a0237f52 100644 --- a/encoder/analyse.h +++ b/encoder/analyse.h @@ -1,7 +1,7 @@ /***************************************************************************** * analyse.h: macroblock analysis ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/encoder/cabac.c b/encoder/cabac.c index 2a9297d9..f9cbae11 100644 --- a/encoder/cabac.c +++ b/encoder/cabac.c @@ -1,7 +1,7 @@ /***************************************************************************** * cabac.c: cabac bitstream writing ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/encoder/cavlc.c b/encoder/cavlc.c index dfdfd91f..b8ea8f2f 100644 --- a/encoder/cavlc.c +++ b/encoder/cavlc.c @@ -1,7 +1,7 @@ /***************************************************************************** * cavlc.c: cavlc bitstream writing ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/encoder/encoder.c b/encoder/encoder.c index f8596e84..2c7438ea 100644 --- a/encoder/encoder.c +++ b/encoder/encoder.c @@ -1,7 +1,7 @@ /***************************************************************************** * encoder.c: top-level encoder functions ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/encoder/lookahead.c b/encoder/lookahead.c index 772db9d6..a6e861bb 100644 --- a/encoder/lookahead.c +++ b/encoder/lookahead.c @@ -1,7 +1,7 @@ /***************************************************************************** * lookahead.c: high-level lookahead functions ***************************************************************************** - * Copyright (C) 2010-2013 Avail Media and x264 project + * Copyright (C) 2010-2014 Avail Media and x264 project * * Authors: Michael Kazmier * Alex Giladi diff --git a/encoder/macroblock.c b/encoder/macroblock.c index da817b3b..1f66278a 100644 --- a/encoder/macroblock.c +++ b/encoder/macroblock.c @@ -1,12 +1,12 @@ /***************************************************************************** * macroblock.c: macroblock encoding ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt * Fiona Glaser - * Henrik Gramner + * Henrik Gramner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/encoder/macroblock.h b/encoder/macroblock.h index a417c269..d0ba11a9 100644 --- a/encoder/macroblock.h +++ b/encoder/macroblock.h @@ -1,7 +1,7 @@ /***************************************************************************** * macroblock.h: macroblock encoding ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/encoder/me.c b/encoder/me.c index 972af474..55aa0ab7 100644 --- a/encoder/me.c +++ b/encoder/me.c @@ -1,7 +1,7 @@ /***************************************************************************** * me.c: motion estimation ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/encoder/me.h b/encoder/me.h index 5857bad6..ceb58df1 100644 --- a/encoder/me.h +++ b/encoder/me.h @@ -1,7 +1,7 @@ /***************************************************************************** * me.h: motion estimation ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c index 641c93eb..3bf62d17 100644 --- a/encoder/ratecontrol.c +++ b/encoder/ratecontrol.c @@ -1,7 +1,7 @@ /***************************************************************************** * ratecontrol.c: ratecontrol ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Loren Merritt * Michael Niedermayer diff --git a/encoder/ratecontrol.h b/encoder/ratecontrol.h index 9306b27d..9321e726 100644 --- a/encoder/ratecontrol.h +++ b/encoder/ratecontrol.h @@ -1,7 +1,7 @@ /***************************************************************************** * ratecontrol.h: ratecontrol ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/encoder/rdo.c b/encoder/rdo.c index 0dbcf2ae..93fdc3a6 100644 --- a/encoder/rdo.c +++ b/encoder/rdo.c @@ -1,7 +1,7 @@ /***************************************************************************** * rdo.c: rate-distortion optimization ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Loren Merritt * Fiona Glaser diff --git a/encoder/set.c b/encoder/set.c index 61eb0061..c3aa7c28 100644 --- a/encoder/set.c +++ b/encoder/set.c @@ -1,7 +1,7 @@ /***************************************************************************** * set: header writing ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -576,7 +576,7 @@ int x264_sei_version_write( x264_t *h, bs_t *s ) memcpy( payload, uuid, 16 ); sprintf( payload+16, "x264 - core %d%s - H.264/MPEG-4 AVC codec - " - "Copy%s 2003-2013 - http://www.videolan.org/x264.html - options: %s", + "Copy%s 2003-2014 - http://www.videolan.org/x264.html - options: %s", X264_BUILD, X264_VERSION, HAVE_GPL?"left":"right", opts ); length = strlen(payload)+1; diff --git a/encoder/set.h b/encoder/set.h index d70bec85..5a8e1c79 100644 --- a/encoder/set.h +++ b/encoder/set.h @@ -1,7 +1,7 @@ /***************************************************************************** * set.h: header writing ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/encoder/slicetype-cl.c b/encoder/slicetype-cl.c index 334215f8..a7cd00b9 100644 --- a/encoder/slicetype-cl.c +++ b/encoder/slicetype-cl.c @@ -1,7 +1,7 @@ /***************************************************************************** * slicetype-cl.c: OpenCL slicetype decision code (lowres lookahead) ***************************************************************************** - * Copyright (C) 2012-2013 x264 project + * Copyright (C) 2012-2014 x264 project * * Authors: Steve Borho * diff --git a/encoder/slicetype.c b/encoder/slicetype.c index e300bbf3..6afc1a40 100644 --- a/encoder/slicetype.c +++ b/encoder/slicetype.c @@ -1,7 +1,7 @@ /***************************************************************************** * slicetype.c: lookahead analysis ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Fiona Glaser * Loren Merritt diff --git a/filters/filters.c b/filters/filters.c index bf3dad45..1ea888ce 100644 --- a/filters/filters.c +++ b/filters/filters.c @@ -1,7 +1,7 @@ /***************************************************************************** * filters.c: common filter functions ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Diogo Franco * Steven Walters diff --git a/filters/filters.h b/filters/filters.h index b75f3f16..1b51b4a0 100644 --- a/filters/filters.h +++ b/filters/filters.h @@ -1,7 +1,7 @@ /***************************************************************************** * filters.h: common filter functions ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Diogo Franco * Steven Walters diff --git a/filters/video/cache.c b/filters/video/cache.c index cc2cef0e..6de005ff 100644 --- a/filters/video/cache.c +++ b/filters/video/cache.c @@ -1,7 +1,7 @@ /***************************************************************************** * cache.c: cache video filter ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/filters/video/crop.c b/filters/video/crop.c index 98faab74..643c0a4b 100644 --- a/filters/video/crop.c +++ b/filters/video/crop.c @@ -1,7 +1,7 @@ /***************************************************************************** * crop.c: crop video filter ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * James Darnley diff --git a/filters/video/depth.c b/filters/video/depth.c index a20f3b3f..5fcbd207 100644 --- a/filters/video/depth.c +++ b/filters/video/depth.c @@ -1,7 +1,7 @@ /***************************************************************************** * depth.c: bit-depth conversion video filter ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Oskar Arvidsson * diff --git a/filters/video/fix_vfr_pts.c b/filters/video/fix_vfr_pts.c index 80138f17..9bf870b4 100644 --- a/filters/video/fix_vfr_pts.c +++ b/filters/video/fix_vfr_pts.c @@ -1,7 +1,7 @@ /***************************************************************************** * fix_vfr_pts.c: vfr pts fixing video filter ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/filters/video/internal.c b/filters/video/internal.c index c146064c..55fb42e8 100644 --- a/filters/video/internal.c +++ b/filters/video/internal.c @@ -1,7 +1,7 @@ /***************************************************************************** * internal.c: video filter utilities ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/filters/video/internal.h b/filters/video/internal.h index 7d112a0f..f3bb2f42 100644 --- a/filters/video/internal.h +++ b/filters/video/internal.h @@ -1,7 +1,7 @@ /***************************************************************************** * internal.h: video filter utilities ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/filters/video/resize.c b/filters/video/resize.c index 5d8a4890..7480a149 100644 --- a/filters/video/resize.c +++ b/filters/video/resize.c @@ -1,7 +1,7 @@ /***************************************************************************** * resize.c: resize video filter ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/filters/video/select_every.c b/filters/video/select_every.c index e7c70cee..38492bf7 100644 --- a/filters/video/select_every.c +++ b/filters/video/select_every.c @@ -1,7 +1,7 @@ /***************************************************************************** * select_every.c: select-every video filter ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/filters/video/source.c b/filters/video/source.c index 754b9d0a..397bd791 100644 --- a/filters/video/source.c +++ b/filters/video/source.c @@ -1,7 +1,7 @@ /***************************************************************************** * source.c: source video filter ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/filters/video/video.c b/filters/video/video.c index c6f9e224..b54aec07 100644 --- a/filters/video/video.c +++ b/filters/video/video.c @@ -1,7 +1,7 @@ /***************************************************************************** * video.c: video filters ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/filters/video/video.h b/filters/video/video.h index 41bf277d..4caf98e1 100644 --- a/filters/video/video.h +++ b/filters/video/video.h @@ -1,7 +1,7 @@ /***************************************************************************** * video.h: video filters ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/input/avs.c b/input/avs.c index 3c1f23b2..918978f3 100644 --- a/input/avs.c +++ b/input/avs.c @@ -1,7 +1,7 @@ /***************************************************************************** * avs.c: avisynth input ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: Steven Walters * diff --git a/input/ffms.c b/input/ffms.c index c52ed03f..d9cb5f34 100644 --- a/input/ffms.c +++ b/input/ffms.c @@ -1,7 +1,7 @@ /***************************************************************************** * ffms.c: ffmpegsource input ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: Mike Gurlitz * Steven Walters diff --git a/input/input.c b/input/input.c index 5cb277cf..9a99fa36 100644 --- a/input/input.c +++ b/input/input.c @@ -1,7 +1,7 @@ /***************************************************************************** * input.c: common input functions ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Steven Walters * diff --git a/input/input.h b/input/input.h index a33d22a9..919c52c4 100644 --- a/input/input.h +++ b/input/input.h @@ -1,7 +1,7 @@ /***************************************************************************** * input.h: file input ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/input/lavf.c b/input/lavf.c index 1cc592a2..27a61d90 100644 --- a/input/lavf.c +++ b/input/lavf.c @@ -1,7 +1,7 @@ /***************************************************************************** * lavf.c: libavformat input ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: Mike Gurlitz * Steven Walters diff --git a/input/raw.c b/input/raw.c index 9d21c596..0caf6f02 100644 --- a/input/raw.c +++ b/input/raw.c @@ -1,7 +1,7 @@ /***************************************************************************** * raw.c: raw input ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/input/thread.c b/input/thread.c index 9cb422a1..be6302ca 100644 --- a/input/thread.c +++ b/input/thread.c @@ -1,7 +1,7 @@ /***************************************************************************** * thread.c: threaded input ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/input/timecode.c b/input/timecode.c index 7653f837..1a0b3204 100644 --- a/input/timecode.c +++ b/input/timecode.c @@ -1,7 +1,7 @@ /***************************************************************************** * timecode.c: timecode file input ***************************************************************************** - * Copyright (C) 2010-2013 x264 project + * Copyright (C) 2010-2014 x264 project * * Authors: Yusuke Nakamura * diff --git a/input/y4m.c b/input/y4m.c index bf62e837..5597c434 100644 --- a/input/y4m.c +++ b/input/y4m.c @@ -1,7 +1,7 @@ /***************************************************************************** * y4m.c: y4m input ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/output/flv.c b/output/flv.c index 46e46b36..bb02f585 100644 --- a/output/flv.c +++ b/output/flv.c @@ -1,7 +1,7 @@ /***************************************************************************** * flv.c: flv muxer ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: Kieran Kunhya * diff --git a/output/flv_bytestream.c b/output/flv_bytestream.c index b6c29a2a..2e7e8615 100644 --- a/output/flv_bytestream.c +++ b/output/flv_bytestream.c @@ -1,7 +1,7 @@ /***************************************************************************** * flv_bytestream.c: flv muxer utilities ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: Kieran Kunhya * diff --git a/output/flv_bytestream.h b/output/flv_bytestream.h index 325abb61..7f351c09 100644 --- a/output/flv_bytestream.h +++ b/output/flv_bytestream.h @@ -1,7 +1,7 @@ /***************************************************************************** * flv_bytestream.h: flv muxer utilities ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: Kieran Kunhya * diff --git a/output/matroska.c b/output/matroska.c index 00a13f56..baa0f1ca 100644 --- a/output/matroska.c +++ b/output/matroska.c @@ -1,7 +1,7 @@ /***************************************************************************** * matroska.c: matroska muxer ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Mike Matsnev * diff --git a/output/matroska_ebml.c b/output/matroska_ebml.c index 943c65ee..55c1cc37 100644 --- a/output/matroska_ebml.c +++ b/output/matroska_ebml.c @@ -1,7 +1,7 @@ /***************************************************************************** * matroska_ebml.c: matroska muxer utilities ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Mike Matsnev * diff --git a/output/matroska_ebml.h b/output/matroska_ebml.h index fa61eded..1c6cad7a 100644 --- a/output/matroska_ebml.h +++ b/output/matroska_ebml.h @@ -1,7 +1,7 @@ /***************************************************************************** * matroska_ebml.h: matroska muxer utilities ***************************************************************************** - * Copyright (C) 2005-2013 x264 project + * Copyright (C) 2005-2014 x264 project * * Authors: Mike Matsnev * diff --git a/output/mp4.c b/output/mp4.c index 8093b2b7..6d353def 100644 --- a/output/mp4.c +++ b/output/mp4.c @@ -1,7 +1,7 @@ /***************************************************************************** * mp4.c: mp4 muxer ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/output/mp4_lsmash.c b/output/mp4_lsmash.c index 9513506d..b4ed31c2 100644 --- a/output/mp4_lsmash.c +++ b/output/mp4_lsmash.c @@ -1,7 +1,7 @@ /***************************************************************************** * mp4_lsmash.c: mp4 muxer using L-SMASH ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/output/output.h b/output/output.h index e32dbbea..26ec7059 100644 --- a/output/output.h +++ b/output/output.h @@ -1,7 +1,7 @@ /***************************************************************************** * output.h: x264 file output modules ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/output/raw.c b/output/raw.c index 4bfb7895..2876e26a 100644 --- a/output/raw.c +++ b/output/raw.c @@ -1,7 +1,7 @@ /***************************************************************************** * raw.c: raw muxer ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/tools/checkasm-a.asm b/tools/checkasm-a.asm index 722d746b..c27c7231 100644 --- a/tools/checkasm-a.asm +++ b/tools/checkasm-a.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* checkasm-a.asm: assembly check tool ;***************************************************************************** -;* Copyright (C) 2008-2013 x264 project +;* Copyright (C) 2008-2014 x264 project ;* ;* Authors: Loren Merritt ;* Henrik Gramner diff --git a/tools/checkasm.c b/tools/checkasm.c index 8cfebeb9..4239605c 100644 --- a/tools/checkasm.c +++ b/tools/checkasm.c @@ -1,7 +1,7 @@ /***************************************************************************** * checkasm.c: assembly check tool ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/tools/cltostr.pl b/tools/cltostr.pl index 371a1bd6..a90e6a94 100644 --- a/tools/cltostr.pl +++ b/tools/cltostr.pl @@ -1,6 +1,6 @@ # Perl script used for compiling OpenCL src into x264 binary # -# Copyright (C) 2013 x264 project +# Copyright (C) 2013-2014 x264 project # Authors: Steve Borho use Digest::MD5 qw(md5_hex); diff --git a/x264.c b/x264.c index d782ae05..a32e43d9 100644 --- a/x264.c +++ b/x264.c @@ -1,7 +1,7 @@ /***************************************************************************** * x264: top-level x264cli functions ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Loren Merritt * Laurent Aimar diff --git a/x264.h b/x264.h index 8175c35d..796fb530 100644 --- a/x264.h +++ b/x264.h @@ -1,7 +1,7 @@ /***************************************************************************** * x264.h: x264 public header ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/x264cli.h b/x264cli.h index 1794992a..d92d4969 100644 --- a/x264cli.h +++ b/x264cli.h @@ -1,7 +1,7 @@ /***************************************************************************** * x264cli.h: x264cli common ***************************************************************************** - * Copyright (C) 2003-2013 x264 project + * Copyright (C) 2003-2014 x264 project * * Authors: Laurent Aimar * Loren Merritt diff --git a/x264dll.c b/x264dll.c index ae4a81ac..e1ca13cf 100644 --- a/x264dll.c +++ b/x264dll.c @@ -1,7 +1,7 @@ /***************************************************************************** * x264dll: x264 DLLMain for win32 ***************************************************************************** - * Copyright (C) 2009-2013 x264 project + * Copyright (C) 2009-2014 x264 project * * Authors: Anton Mitrofanov * diff --git a/x264res.rc b/x264res.rc index d25c8108..33b59f78 100644 --- a/x264res.rc +++ b/x264res.rc @@ -1,7 +1,7 @@ /***************************************************************************** * x264res.rc: windows resource file ***************************************************************************** - * Copyright (C) 2012-2013 x264 project + * Copyright (C) 2012-2014 x264 project * * Authors: Henrik Gramner * @@ -60,7 +60,7 @@ BEGIN #endif VALUE "FileVersion", X264_POINTVER VALUE "InternalName", "x264" - VALUE "LegalCopyright", "Copyright (C) 2003-2013 x264 project" + VALUE "LegalCopyright", "Copyright (C) 2003-2014 x264 project" #ifdef DLL VALUE "OriginalFilename", "libx264-" xstr(X264_BUILD) ".dll" #else