From bdbd4fe7709e129f90cf3d7d59b500e915c6b187 Mon Sep 17 00:00:00 2001 From: Fiona Glaser Date: Thu, 3 Jul 2008 20:05:00 -0600 Subject: [PATCH] Update file headers throughout x264 Update "Authors" lists based on actual authorship; highest is most important Update copyright notices and remove old CVS tags from file headers Add file headers to GTK and other sections missing them Update FSF address Other header-related cosmetics --- common/bs.h | 7 ++----- common/cabac.c | 6 +++--- common/cabac.h | 8 ++++---- common/common.c | 8 ++++---- common/common.h | 6 +++--- common/cpu.c | 8 ++++---- common/cpu.h | 7 ++----- common/dct.c | 8 ++++---- common/dct.h | 7 ++----- common/display-x11.c | 6 ++---- common/display.h | 6 ++---- common/frame.c | 6 +++--- common/frame.h | 6 +++--- common/macroblock.c | 7 ++++--- common/macroblock.h | 9 +++++---- common/mc.c | 6 +++--- common/mc.h | 7 ++----- common/mdate.c | 7 ++----- common/osdep.h | 7 +++++-- common/pixel.c | 8 ++++---- common/pixel.h | 7 ++----- common/ppc/dct.c | 9 ++++----- common/ppc/dct.h | 5 ++--- common/ppc/deblock.c | 7 ++----- common/ppc/mc.c | 6 +++--- common/ppc/mc.h | 7 ++----- common/ppc/pixel.c | 5 ++--- common/ppc/pixel.h | 7 ++----- common/ppc/ppccommon.h | 7 ++----- common/ppc/predict.c | 6 ++---- common/ppc/predict.h | 6 ++---- common/ppc/quant.c | 4 ++-- common/ppc/quant.h | 4 ++-- common/predict.c | 6 +++--- common/predict.h | 8 ++++---- common/quant.c | 7 ++++--- common/quant.h | 6 +++--- common/set.c | 6 ++---- common/set.h | 8 ++++---- common/sparc/pixel.asm | 7 ++----- common/sparc/pixel.h | 7 ++----- common/visualize.c | 6 ++---- common/visualize.h | 6 ++---- common/vlc.h | 7 ++----- common/x86/cabac-a.asm | 3 ++- common/x86/cpu-32.asm | 3 ++- common/x86/cpu-64.asm | 3 ++- common/x86/dct-32.asm | 4 ++-- common/x86/dct-64.asm | 4 ++-- common/x86/dct-a.asm | 4 ++-- common/x86/dct.h | 7 ++++--- common/x86/deblock-a.asm | 2 +- common/x86/mc-a.asm | 3 ++- common/x86/mc-a2.asm | 3 ++- common/x86/mc-c.c | 3 ++- common/x86/mc.h | 7 ++++--- common/x86/pixel-32.asm | 2 +- common/x86/pixel-a.asm | 2 +- common/x86/pixel.h | 4 ++-- common/x86/predict-a.asm | 3 ++- common/x86/predict-c.c | 6 +++--- common/x86/predict.h | 5 +++-- common/x86/quant-a.asm | 2 +- common/x86/quant.h | 5 +++-- common/x86/sad-a.asm | 2 +- common/x86/util.h | 7 +++++-- common/x86/x86inc-32.asm | 5 +++-- common/x86/x86inc-64.asm | 4 ++-- common/x86/x86inc.asm | 2 +- encoder/analyse.c | 5 ++--- encoder/analyse.h | 6 +++--- encoder/cabac.c | 6 +++--- encoder/cavlc.c | 6 +++--- encoder/encoder.c | 6 +++--- encoder/eval.c | 7 +++---- encoder/macroblock.c | 5 +++-- encoder/macroblock.h | 8 ++++---- encoder/me.c | 10 +++++----- encoder/me.h | 8 ++++---- encoder/ratecontrol.c | 7 ++++--- encoder/ratecontrol.h | 8 ++++---- encoder/rdo.c | 6 ++---- encoder/set.c | 6 +++--- encoder/set.h | 6 +++--- encoder/slicetype.c | 6 ++---- extras/getopt.c | 2 +- extras/getopt.h | 2 +- gtk/test.c | 20 ++++++++++++++++++++ gtk/x264_gtk.c | 20 ++++++++++++++++++++ gtk/x264_gtk.h | 20 ++++++++++++++++++++ gtk/x264_gtk_bitrate.c | 20 ++++++++++++++++++++ gtk/x264_gtk_bitrate.h | 20 ++++++++++++++++++++ gtk/x264_gtk_cqm.c | 20 ++++++++++++++++++++ gtk/x264_gtk_cqm.h | 20 ++++++++++++++++++++ gtk/x264_gtk_demuxers.h | 20 ++++++++++++++++++++ gtk/x264_gtk_encode.c | 20 ++++++++++++++++++++ gtk/x264_gtk_encode_encode.c | 20 ++++++++++++++++++++ gtk/x264_gtk_encode_encode.h | 20 ++++++++++++++++++++ gtk/x264_gtk_encode_main_window.c | 20 ++++++++++++++++++++ gtk/x264_gtk_encode_main_window.h | 20 ++++++++++++++++++++ gtk/x264_gtk_encode_private.h | 20 ++++++++++++++++++++ gtk/x264_gtk_encode_status_window.c | 20 ++++++++++++++++++++ gtk/x264_gtk_encode_status_window.h | 20 ++++++++++++++++++++ gtk/x264_gtk_enum.h | 20 ++++++++++++++++++++ gtk/x264_gtk_i18n.h | 20 ++++++++++++++++++++ gtk/x264_gtk_mb.c | 20 ++++++++++++++++++++ gtk/x264_gtk_mb.h | 20 ++++++++++++++++++++ gtk/x264_gtk_more.c | 20 ++++++++++++++++++++ gtk/x264_gtk_more.h | 20 ++++++++++++++++++++ gtk/x264_gtk_private.h | 20 ++++++++++++++++++++ gtk/x264_gtk_rc.c | 20 ++++++++++++++++++++ gtk/x264_gtk_rc.h | 20 ++++++++++++++++++++ matroska.c | 7 ++----- matroska.h | 7 ++----- muxers.c | 7 +++++-- muxers.h | 23 +++++++++++++++++++++++ tools/avc2avi.c | 6 +++--- tools/checkasm-a.asm | 4 ++-- tools/checkasm.c | 24 ++++++++++++++++++++++++ tools/xyuv.c | 7 ++----- x264.c | 8 ++++---- x264.h | 6 +++--- 122 files changed, 800 insertions(+), 298 deletions(-) diff --git a/common/bs.h b/common/bs.h index a06b822a..88d41f03 100644 --- a/common/bs.h +++ b/common/bs.h @@ -1,10 +1,7 @@ /***************************************************************************** * bs.h : ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: bs.h,v 1.1 2004/06/03 19:27:06 fenrir Exp $ - * - * Authors: Laurent Aimar + * Copyright (C) 2003 Laurent Aimar * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_BS_H diff --git a/common/cabac.c b/common/cabac.c index c6c2bd38..722451bd 100644 --- a/common/cabac.c +++ b/common/cabac.c @@ -1,10 +1,10 @@ /***************************************************************************** * cabac.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: cabac.c,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common.h" diff --git a/common/cabac.h b/common/cabac.h index 8289d2b0..f5efa248 100644 --- a/common/cabac.h +++ b/common/cabac.h @@ -1,10 +1,10 @@ /***************************************************************************** * cabac.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: cabac.h,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_CABAC_H diff --git a/common/common.c b/common/common.c index 8a8f6600..71a29b1a 100644 --- a/common/common.c +++ b/common/common.c @@ -1,10 +1,10 @@ /***************************************************************************** * common.c: h264 library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: common.c,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/common/common.h b/common/common.h index f46aee52..376ec1e9 100644 --- a/common/common.h +++ b/common/common.h @@ -1,10 +1,10 @@ /***************************************************************************** * common.h: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: common.h,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_COMMON_H diff --git a/common/cpu.c b/common/cpu.c index f2b5f037..307a0ee1 100644 --- a/common/cpu.c +++ b/common/cpu.c @@ -1,10 +1,10 @@ /***************************************************************************** * cpu.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: cpu.c,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #if defined(HAVE_PTHREAD) && defined(SYS_LINUX) diff --git a/common/cpu.h b/common/cpu.h index 30e966ab..91b43f93 100644 --- a/common/cpu.h +++ b/common/cpu.h @@ -1,10 +1,7 @@ /***************************************************************************** * cpu.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: cpu.h,v 1.1 2004/06/03 19:27:06 fenrir Exp $ - * - * Authors: Laurent Aimar + * Copyright (C) 2004-2008 Loren Merritt * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_CPU_H diff --git a/common/dct.c b/common/dct.c index 1815fc3d..5e6f798c 100644 --- a/common/dct.c +++ b/common/dct.c @@ -1,10 +1,10 @@ /***************************************************************************** * dct.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: dct.c,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common.h" diff --git a/common/dct.h b/common/dct.h index ee9d7d1e..1078023d 100644 --- a/common/dct.h +++ b/common/dct.h @@ -1,10 +1,7 @@ /***************************************************************************** * dct.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: dct.h,v 1.1 2004/06/03 19:27:06 fenrir Exp $ - * - * Authors: Laurent Aimar + * Copyright (C) 2004-2008 Loren Merritt * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_DCT_H diff --git a/common/display-x11.c b/common/display-x11.c index f16db8b7..d6594265 100644 --- a/common/display-x11.c +++ b/common/display-x11.c @@ -1,9 +1,7 @@ /***************************************************************************** * x264: h264 encoder ***************************************************************************** - * Copyright (C) 2005 x264 project - * - * Author: Tuukka Toivonen + * Copyright (C) 2005 Tuukka Toivonen * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/common/display.h b/common/display.h index 31dcc289..544d5576 100644 --- a/common/display.h +++ b/common/display.h @@ -1,9 +1,7 @@ /***************************************************************************** * x264: h264 encoder ***************************************************************************** - * Copyright (C) 2005 x264 project - * - * Author: Tuukka Toivonen + * Copyright (C) 2005 Tuukka Toivonen * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_DISPLAY_H diff --git a/common/frame.c b/common/frame.c index 5d6de239..dd77c897 100644 --- a/common/frame.c +++ b/common/frame.c @@ -1,10 +1,10 @@ /***************************************************************************** * frame.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: frame.c,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common.h" diff --git a/common/frame.h b/common/frame.h index 1cd7b645..6da740ab 100644 --- a/common/frame.h +++ b/common/frame.h @@ -1,10 +1,10 @@ /***************************************************************************** * frame.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: frame.h,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_FRAME_H diff --git a/common/macroblock.c b/common/macroblock.c index b08d4303..88a7f454 100644 --- a/common/macroblock.c +++ b/common/macroblock.c @@ -1,10 +1,11 @@ /***************************************************************************** * macroblock.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: macroblock.c,v 1.1 2004/06/03 19:27:06 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt + * Fiona Glaser * * 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 @@ -18,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common.h" diff --git a/common/macroblock.h b/common/macroblock.h index a59b4f76..14741fc2 100644 --- a/common/macroblock.h +++ b/common/macroblock.h @@ -1,10 +1,11 @@ /***************************************************************************** * macroblock.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: macroblock.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2005-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar + * Fiona Glaser * * 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 @@ -18,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_MACROBLOCK_H diff --git a/common/mc.c b/common/mc.c index 2178f08e..671f3968 100644 --- a/common/mc.c +++ b/common/mc.c @@ -1,10 +1,10 @@ /***************************************************************************** * mc.c: h264 encoder library (Motion Compensation) ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: mc.c,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common.h" diff --git a/common/mc.h b/common/mc.h index 08331b81..f682b855 100644 --- a/common/mc.h +++ b/common/mc.h @@ -1,10 +1,7 @@ /***************************************************************************** * mc.h: h264 encoder library (Motion Compensation) ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: mc.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ - * - * Authors: Laurent Aimar + * Copyright (C) 2004-2008 Loren Merritt * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_MC_H diff --git a/common/mdate.c b/common/mdate.c index a856ac10..cd962edc 100644 --- a/common/mdate.c +++ b/common/mdate.c @@ -1,10 +1,7 @@ /***************************************************************************** * mdate.c: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: mdate.c,v 1.1 2004/06/03 19:27:07 fenrir Exp $ - * - * Authors: Laurent Aimar + * Copyright (C) 2003 Laurent Aimar * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #if !(defined(_MSC_VER) || defined(__MINGW32__)) diff --git a/common/osdep.h b/common/osdep.h index 36685bec..7b8dacb2 100644 --- a/common/osdep.h +++ b/common/osdep.h @@ -1,7 +1,10 @@ /***************************************************************************** * osdep.h: h264 encoder ***************************************************************************** - * Copyright (C) 2007 x264 project + * Copyright (C) 2007-2008 x264 project + * + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -15,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_OSDEP_H diff --git a/common/pixel.c b/common/pixel.c index 64a410eb..afbf309e 100644 --- a/common/pixel.c +++ b/common/pixel.c @@ -1,10 +1,10 @@ /***************************************************************************** * pixel.c: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: pixel.c,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common.h" diff --git a/common/pixel.h b/common/pixel.h index c95a3046..3d94bf00 100644 --- a/common/pixel.h +++ b/common/pixel.h @@ -1,10 +1,7 @@ /***************************************************************************** * pixel.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: pixel.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ - * - * Authors: Laurent Aimar + * Copyright (C) 2004-2008 Loren Merritt * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_PIXEL_H diff --git a/common/ppc/dct.c b/common/ppc/dct.c index 5ba2264a..88612143 100644 --- a/common/ppc/dct.c +++ b/common/ppc/dct.c @@ -1,11 +1,10 @@ /***************************************************************************** * dct.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id$ + * Copyright (C) 2003-2008 x264 project * - * Authors: Eric Petit - * Guillaume Poirier + * Authors: Guillaume Poirier + * Eric Petit * * 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 @@ -19,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifdef SYS_LINUX diff --git a/common/ppc/dct.h b/common/ppc/dct.h index 859e4ea8..ddb459aa 100644 --- a/common/ppc/dct.h +++ b/common/ppc/dct.h @@ -1,8 +1,7 @@ /***************************************************************************** * dct.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id$ + * Copyright (C) 2003-2008 x264 project * * Authors: Eric Petit * Guillaume Poirier @@ -19,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_PPC_DCT_H diff --git a/common/ppc/deblock.c b/common/ppc/deblock.c index 33b653c0..f127cec8 100644 --- a/common/ppc/deblock.c +++ b/common/ppc/deblock.c @@ -1,10 +1,7 @@ /***************************************************************************** * deblock.c: Altivec-accelerated deblocking for h264 encoder ***************************************************************************** -* Copyright (C) 2007 x264 project -* -* Authors: Guillaume Poirier -* (based on code written by Graham Booker for FFmpeg) +* Copyright (C) 2007-2008 Guillaume Poirier * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #if defined SYS_LINUX diff --git a/common/ppc/mc.c b/common/ppc/mc.c index c99cd31e..b1ae2c6a 100644 --- a/common/ppc/mc.c +++ b/common/ppc/mc.c @@ -1,10 +1,10 @@ /***************************************************************************** * mc.c: h264 encoder library (Motion Compensation) ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: mc.c,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Eric Petit + * Guillaume Poirier * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/common/ppc/mc.h b/common/ppc/mc.h index a15e614d..1626cadd 100644 --- a/common/ppc/mc.h +++ b/common/ppc/mc.h @@ -1,10 +1,7 @@ /***************************************************************************** * mc.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: mc.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ - * - * Authors: Eric Petit + * Copyright (C) 2003-2008 Eric Petit * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_PPC_MC_H diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c index e964cbe0..1dae5ef1 100644 --- a/common/ppc/pixel.c +++ b/common/ppc/pixel.c @@ -1,8 +1,7 @@ /***************************************************************************** * pixel.c: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: pixel.c,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Eric Petit * Guillaume Poirier @@ -19,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifdef SYS_LINUX diff --git a/common/ppc/pixel.h b/common/ppc/pixel.h index e1925b3b..9eaef1c0 100644 --- a/common/ppc/pixel.h +++ b/common/ppc/pixel.h @@ -1,10 +1,7 @@ /***************************************************************************** * pixel.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: pixel.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ - * - * Authors: Eric Petit + * Copyright (C) 2003-2004 Eric Petit * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_PPC_PIXEL_H diff --git a/common/ppc/ppccommon.h b/common/ppc/ppccommon.h index d3c691b9..72e8a308 100644 --- a/common/ppc/ppccommon.h +++ b/common/ppc/ppccommon.h @@ -1,10 +1,7 @@ /***************************************************************************** * ppccommon.h: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: ppccommon.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ - * - * Authors: Eric Petit + * Copyright (C) 2003 Eric Petit * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ /*********************************************************************** diff --git a/common/ppc/predict.c b/common/ppc/predict.c index 61912205..a85683fd 100644 --- a/common/ppc/predict.c +++ b/common/ppc/predict.c @@ -1,9 +1,7 @@ /***************************************************************************** * predict.c: h264 encoder ***************************************************************************** - * Copyright (C) 2007 Guillaume POIRIER - * - * Authors: Guillaume POIRIER + * Copyright (C) 2007-2008 Guillaume Poirier * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifdef SYS_LINUX diff --git a/common/ppc/predict.h b/common/ppc/predict.h index 2855a71f..90863b81 100644 --- a/common/ppc/predict.h +++ b/common/ppc/predict.h @@ -1,9 +1,7 @@ /***************************************************************************** * predict.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2007 Guillaume POIRIER - * - * Authors: Guillaume POIRIER + * Copyright (C) 2007 Guillaume Poirier * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_PPC_PREDICT_H diff --git a/common/ppc/quant.c b/common/ppc/quant.c index 72608afd..cc8da64c 100644 --- a/common/ppc/quant.c +++ b/common/ppc/quant.c @@ -1,7 +1,7 @@ /***************************************************************************** * quant.c: h264 encoder ***************************************************************************** -* Authors: Guillaume Poirier +* Copyright (C) 2007 Guillaume Poirier * * 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 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #if defined SYS_LINUX diff --git a/common/ppc/quant.h b/common/ppc/quant.h index 1ec534c7..05049003 100644 --- a/common/ppc/quant.h +++ b/common/ppc/quant.h @@ -1,7 +1,7 @@ /***************************************************************************** * quant.h: h264 encoder library ***************************************************************************** -* Authors: Guillaume Poirier +* Copyright (C) 2007 Guillaume Poirier * * 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 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_PPC_QUANT_H diff --git a/common/predict.c b/common/predict.c index 7f7a5f68..2c4e83b5 100644 --- a/common/predict.c +++ b/common/predict.c @@ -1,11 +1,11 @@ /***************************************************************************** * predict.c: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: predict.c,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar * Loren Merritt + * Fiona Glaser * * 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 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ /* predict4x4 are inspired from ffmpeg h264 decoder */ diff --git a/common/predict.h b/common/predict.h index b9221680..65912190 100644 --- a/common/predict.h +++ b/common/predict.h @@ -1,10 +1,10 @@ /***************************************************************************** * predict.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: predict.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_PREDICT_H diff --git a/common/quant.c b/common/quant.c index 80ae7112..deeaf6c4 100644 --- a/common/quant.c +++ b/common/quant.c @@ -1,9 +1,10 @@ /***************************************************************************** * quant.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2005 x264 project + * Copyright (C) 2005-2008 x264 project * - * Authors: Christian Heine + * Authors: Loren Merritt + * Christian Heine * * 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 @@ -17,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common.h" diff --git a/common/quant.h b/common/quant.h index 58518f79..0d41927b 100644 --- a/common/quant.h +++ b/common/quant.h @@ -1,9 +1,9 @@ /***************************************************************************** * quant.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2005 x264 project + * Copyright (C) 2005-2008 x264 project * - * Authors: Christian Heine + * Authors: Loren Merritt * * 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 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_QUANT_H diff --git a/common/set.c b/common/set.c index c08bceee..df1c2de9 100644 --- a/common/set.c +++ b/common/set.c @@ -1,9 +1,7 @@ /***************************************************************************** * set.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2005 x264 project - * - * Authors: Loren Merritt + * Copyright (C) 2005-2008 Loren Merritt * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common.h" diff --git a/common/set.h b/common/set.h index e6173b0b..2d535119 100644 --- a/common/set.h +++ b/common/set.h @@ -1,10 +1,10 @@ /***************************************************************************** * set.h: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: set.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_SET_H diff --git a/common/sparc/pixel.asm b/common/sparc/pixel.asm index 4bd9aa55..6eb52c73 100644 --- a/common/sparc/pixel.asm +++ b/common/sparc/pixel.asm @@ -1,10 +1,7 @@ /***************************************************************************** * pixel.asm: h264 encoder library ***************************************************************************** - * Copyright (C) 2005 x264 project - * $Id: $ - * - * Authors: Phil Jensen + * Copyright (C) 2005 Phil Jensen * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ ! VIS optimized SAD for UltraSPARC diff --git a/common/sparc/pixel.h b/common/sparc/pixel.h index 07af6843..e38503f0 100644 --- a/common/sparc/pixel.h +++ b/common/sparc/pixel.h @@ -1,10 +1,7 @@ /***************************************************************************** * pixel.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2005 x264 project - * $Id: pixel.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ - * - * Authors: Phil Jensen + * Copyright (C) 2005 Phil Jensen * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_SPARC_PIXEL_H diff --git a/common/visualize.c b/common/visualize.c index a5f90290..f7100f00 100644 --- a/common/visualize.c +++ b/common/visualize.c @@ -1,9 +1,7 @@ /***************************************************************************** * x264: h264 encoder ***************************************************************************** - * Copyright (C) 2005 x264 project - * - * Author: Tuukka Toivonen + * Copyright (C) 2005 Tuukka Toivonen * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ /* diff --git a/common/visualize.h b/common/visualize.h index 34adccac..b611f6cb 100644 --- a/common/visualize.h +++ b/common/visualize.h @@ -1,9 +1,7 @@ /***************************************************************************** * x264: h264 encoder ***************************************************************************** - * Copyright (C) 2005 x264 project - * - * Author: Tuukka Toivonen + * Copyright (C) 2005 Tuukka Toivonen * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_VISUALIZE_H diff --git a/common/vlc.h b/common/vlc.h index 18a83704..7d0b8e06 100644 --- a/common/vlc.h +++ b/common/vlc.h @@ -1,10 +1,7 @@ /***************************************************************************** * vlc.h : vlc table ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: vlc.h,v 1.1 2004/06/03 19:27:07 fenrir Exp $ - * - * Authors: Laurent Aimar + * Copyright (C) 2003 Laurent Aimar * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ typedef struct diff --git a/common/x86/cabac-a.asm b/common/x86/cabac-a.asm index 183164f0..4c884a6c 100644 --- a/common/x86/cabac-a.asm +++ b/common/x86/cabac-a.asm @@ -4,6 +4,7 @@ ;* Copyright (C) 2008 x264 project ;* ;* Author: Loren Merritt +;* Fiona Glaser ;* ;* 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 @@ -17,7 +18,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/cpu-32.asm b/common/x86/cpu-32.asm index 9c5f7c8c..090b9483 100644 --- a/common/x86/cpu-32.asm +++ b/common/x86/cpu-32.asm @@ -4,6 +4,7 @@ ;* Copyright (C) 2003-2008 x264 project ;* ;* Authors: Laurent Aimar +;* Loren Merritt ;* ;* 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 @@ -17,7 +18,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/cpu-64.asm b/common/x86/cpu-64.asm index 99007a5f..8f8a8383 100644 --- a/common/x86/cpu-64.asm +++ b/common/x86/cpu-64.asm @@ -4,6 +4,7 @@ ;* Copyright (C) 2003-2008 x264 project ;* ;* Authors: Laurent Aimar +;* Loren Merritt ;* ;* 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 @@ -17,7 +18,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/dct-32.asm b/common/x86/dct-32.asm index 5e45afb6..3c6df968 100644 --- a/common/x86/dct-32.asm +++ b/common/x86/dct-32.asm @@ -4,9 +4,9 @@ ;* Copyright (C) 2003-2008 x264 project ;* ;* Authors: Laurent Aimar (initial version) +;* Loren Merritt (misc) ;* Min Chen (converted to nasm) ;* Christian Heine (dct8/idct8 functions) -;* Loren Merritt (misc) ;* ;* 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 @@ -20,7 +20,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/dct-64.asm b/common/x86/dct-64.asm index 875c6b0b..a6d753e8 100644 --- a/common/x86/dct-64.asm +++ b/common/x86/dct-64.asm @@ -4,8 +4,8 @@ ;* Copyright (C) 2003-2008 x264 project ;* ;* Authors: Laurent Aimar (initial version) +;* Loren Merritt (dct8, misc) ;* Min Chen (converted to nasm) -;* Loren Merritt (dct8) ;* ;* 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 @@ -19,7 +19,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/dct-a.asm b/common/x86/dct-a.asm index 525f94a3..8026cec0 100644 --- a/common/x86/dct-a.asm +++ b/common/x86/dct-a.asm @@ -4,8 +4,8 @@ ;* Copyright (C) 2003-2008 x264 project ;* ;* Authors: Laurent Aimar -;* Min Chen ;* Loren Merritt +;* Min Chen ;* ;* 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 @@ -19,7 +19,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/dct.h b/common/x86/dct.h index 859937c4..b7370d6d 100644 --- a/common/x86/dct.h +++ b/common/x86/dct.h @@ -1,9 +1,10 @@ /***************************************************************************** * dct.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -17,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_I386_DCT_H diff --git a/common/x86/deblock-a.asm b/common/x86/deblock-a.asm index 2513014c..066e4b64 100644 --- a/common/x86/deblock-a.asm +++ b/common/x86/deblock-a.asm @@ -17,7 +17,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/mc-a.asm b/common/x86/mc-a.asm index 35d2d76f..50c66000 100644 --- a/common/x86/mc-a.asm +++ b/common/x86/mc-a.asm @@ -5,6 +5,7 @@ ;* ;* Authors: Loren Merritt ;* Laurent Aimar +;* Fiona Glaser ;* Min Chen ;* ;* This program is free software; you can redistribute it and/or modify @@ -19,7 +20,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/mc-a2.asm b/common/x86/mc-a2.asm index 6f108cd4..47da6a29 100644 --- a/common/x86/mc-a2.asm +++ b/common/x86/mc-a2.asm @@ -4,6 +4,7 @@ ;* Copyright (C) 2005-2008 x264 project ;* ;* Authors: Loren Merritt +;* Fiona Glaser ;* Mathieu Monnier ;* ;* This program is free software; you can redistribute it and/or modify @@ -18,7 +19,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/mc-c.c b/common/x86/mc-c.c index fb0815aa..9bdd78f0 100644 --- a/common/x86/mc-c.c +++ b/common/x86/mc-c.c @@ -5,6 +5,7 @@ * * Authors: Laurent Aimar * Loren Merritt + * Fiona Glaser * * 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 @@ -18,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/common/x86/mc.h b/common/x86/mc.h index c5d18659..4271faf2 100644 --- a/common/x86/mc.h +++ b/common/x86/mc.h @@ -1,9 +1,10 @@ /***************************************************************************** * mc.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -17,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_I386_MC_H diff --git a/common/x86/pixel-32.asm b/common/x86/pixel-32.asm index 44d27ada..08432b05 100644 --- a/common/x86/pixel-32.asm +++ b/common/x86/pixel-32.asm @@ -18,7 +18,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/pixel-a.asm b/common/x86/pixel-a.asm index 361e2a63..01a578eb 100644 --- a/common/x86/pixel-a.asm +++ b/common/x86/pixel-a.asm @@ -19,7 +19,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/pixel.h b/common/x86/pixel.h index 6aa556a8..491b921a 100644 --- a/common/x86/pixel.h +++ b/common/x86/pixel.h @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003-2008 Laurent Aimar + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_I386_PIXEL_H diff --git a/common/x86/predict-a.asm b/common/x86/predict-a.asm index 64a01558..0eb1e378 100644 --- a/common/x86/predict-a.asm +++ b/common/x86/predict-a.asm @@ -4,6 +4,7 @@ ;* Copyright (C) 2005-2008 x264 project ;* ;* Authors: Loren Merritt +;* Fiona Glaser ;* ;* 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 @@ -17,7 +18,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/predict-c.c b/common/x86/predict-c.c index ce671c3a..abd43112 100644 --- a/common/x86/predict-c.c +++ b/common/x86/predict-c.c @@ -1,10 +1,10 @@ /***************************************************************************** * predict.c: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: predict.c,v 1.1 2004/06/03 19:27:07 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common/common.h" diff --git a/common/x86/predict.h b/common/x86/predict.h index 761aa58a..398f3076 100644 --- a/common/x86/predict.h +++ b/common/x86/predict.h @@ -1,9 +1,10 @@ /***************************************************************************** * predict.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -17,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_I386_PREDICT_H diff --git a/common/x86/quant-a.asm b/common/x86/quant-a.asm index 20db71eb..2eda4988 100644 --- a/common/x86/quant-a.asm +++ b/common/x86/quant-a.asm @@ -18,7 +18,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/quant.h b/common/x86/quant.h index c7a560d7..5b31febb 100644 --- a/common/x86/quant.h +++ b/common/x86/quant.h @@ -1,9 +1,10 @@ /***************************************************************************** * quant.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2005 x264 project + * Copyright (C) 2005-2008 x264 project * * Authors: Christian Heine + * Loren Merritt * * 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 @@ -17,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_I386_QUANT_H diff --git a/common/x86/sad-a.asm b/common/x86/sad-a.asm index 3709e28c..42e48892 100644 --- a/common/x86/sad-a.asm +++ b/common/x86/sad-a.asm @@ -19,7 +19,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/common/x86/util.h b/common/x86/util.h index e100a4e4..2158c373 100644 --- a/common/x86/util.h +++ b/common/x86/util.h @@ -1,7 +1,10 @@ /***************************************************************************** * mc.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2008 Loren Merritt + * Copyright (C) 2008 x264 Project + * + * Authors: Fiona Glaser + * Loren Merritt * * 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 @@ -15,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_X86_UTIL_H diff --git a/common/x86/x86inc-32.asm b/common/x86/x86inc-32.asm index 49895fc7..7cf99dc3 100644 --- a/common/x86/x86inc-32.asm +++ b/common/x86/x86inc-32.asm @@ -3,7 +3,8 @@ ;***************************************************************************** ;* Copyright (C) 2006-2008 x264 project ;* -;* Author: Sam Hocevar +;* Authors: Sam Hocevar +;* Loren Merritt ;* ;* 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 @@ -17,7 +18,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** BITS 32 diff --git a/common/x86/x86inc-64.asm b/common/x86/x86inc-64.asm index 5396fd8b..b4d259c6 100644 --- a/common/x86/x86inc-64.asm +++ b/common/x86/x86inc-64.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* x86inc-64.asm: h264 encoder library ;***************************************************************************** -;* Copyright (C) 2005-2008 x264 project +;* Copyright (C) 2005-2008 Loren Merritt ;* ;* 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 @@ -15,7 +15,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** BITS 64 diff --git a/common/x86/x86inc.asm b/common/x86/x86inc.asm index fe08b7bc..7962c932 100644 --- a/common/x86/x86inc.asm +++ b/common/x86/x86inc.asm @@ -15,7 +15,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %ifdef ARCH_X86_64 diff --git a/encoder/analyse.c b/encoder/analyse.c index 6e0f9f12..7afa8531 100644 --- a/encoder/analyse.c +++ b/encoder/analyse.c @@ -1,8 +1,7 @@ /***************************************************************************** * analyse.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 x264 project - * $Id: analyse.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -19,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/encoder/analyse.h b/encoder/analyse.h index 11995933..b8c828f6 100644 --- a/encoder/analyse.h +++ b/encoder/analyse.h @@ -1,10 +1,10 @@ /***************************************************************************** * analyse.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: analyse.h,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_ANALYSE_H diff --git a/encoder/cabac.c b/encoder/cabac.c index d7842b1c..01278528 100644 --- a/encoder/cabac.c +++ b/encoder/cabac.c @@ -1,10 +1,10 @@ /***************************************************************************** * cabac.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: cabac.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common/common.h" diff --git a/encoder/cavlc.c b/encoder/cavlc.c index 7d5bc84c..ffe16ada 100644 --- a/encoder/cavlc.c +++ b/encoder/cavlc.c @@ -1,10 +1,10 @@ /***************************************************************************** * cavlc.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: cavlc.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common/common.h" diff --git a/encoder/encoder.c b/encoder/encoder.c index 43f9f9f7..e87105d3 100644 --- a/encoder/encoder.c +++ b/encoder/encoder.c @@ -1,10 +1,10 @@ /***************************************************************************** * x264: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: encoder.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/encoder/eval.c b/encoder/eval.c index eec1cc03..66085484 100644 --- a/encoder/eval.c +++ b/encoder/eval.c @@ -1,6 +1,6 @@ -/* +/***************************************************************************** * simple arithmetic expression evaluator - * + ***************************************************************************** * Copyright (c) 2002 Michael Niedermayer * * This library is free software; you can redistribute it and/or @@ -16,8 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ + *****************************************************************************/ /** * @file eval.c diff --git a/encoder/macroblock.c b/encoder/macroblock.c index 403b8587..3eb29ecc 100644 --- a/encoder/macroblock.c +++ b/encoder/macroblock.c @@ -1,10 +1,11 @@ /***************************************************************************** * macroblock.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: macroblock.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt + * Fiona Glaser * * 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 d17a919a..49d13a25 100644 --- a/encoder/macroblock.h +++ b/encoder/macroblock.h @@ -1,10 +1,10 @@ /***************************************************************************** * macroblock.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: macroblock.h,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_ENCODER_MACROBLOCK_H diff --git a/encoder/me.c b/encoder/me.c index 216c909a..5d1a2e6b 100644 --- a/encoder/me.c +++ b/encoder/me.c @@ -1,11 +1,11 @@ /***************************************************************************** * me.c: h264 encoder library (Motion Estimation) ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: me.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar - * Loren Merritt + * Authors: Loren Merritt + * Laurent Aimar + * Fiona Glaser * * 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 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common/common.h" diff --git a/encoder/me.h b/encoder/me.h index 6775a975..34806e12 100644 --- a/encoder/me.h +++ b/encoder/me.h @@ -1,10 +1,10 @@ /***************************************************************************** * me.h: h264 encoder library (Motion Estimation) ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: me.h,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_ME_H diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c index bd33b886..9f31ecfe 100644 --- a/encoder/ratecontrol.c +++ b/encoder/ratecontrol.c @@ -1,11 +1,12 @@ /***************************************************-*- coding: iso-8859-1 -*- * ratecontrol.c: h264 encoder library (Rate Control) ***************************************************************************** - * Copyright (C) 2005 x264 project - * $Id: ratecontrol.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2005-2008 x264 project * * Authors: Loren Merritt * Michael Niedermayer + * Gabriel Bouvigne + * Fiona Glaser * Måns Rullgård * * This program is free software; you can redistribute it and/or modify @@ -20,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #define _ISOC99_SOURCE diff --git a/encoder/ratecontrol.h b/encoder/ratecontrol.h index 38f5f232..c87414c3 100644 --- a/encoder/ratecontrol.h +++ b/encoder/ratecontrol.h @@ -1,10 +1,10 @@ /***************************************************************************** * ratecontrol.h: h264 encoder library (Rate Control) ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: ratecontrol.h,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_RATECONTROL_H diff --git a/encoder/rdo.c b/encoder/rdo.c index 8223efd8..edc50766 100644 --- a/encoder/rdo.c +++ b/encoder/rdo.c @@ -1,9 +1,7 @@ /***************************************************************************** * rdo.c: h264 encoder library (rate-distortion optimization) ***************************************************************************** - * Copyright (C) 2005 x264 project - * - * Authors: Loren Merritt + * Copyright (C) 2005-2008 Loren Merritt * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ /* duplicate all the writer functions, just calculating bit cost diff --git a/encoder/set.c b/encoder/set.c index 6cf87732..c3a065d0 100644 --- a/encoder/set.c +++ b/encoder/set.c @@ -1,10 +1,10 @@ /***************************************************************************** * set: h264 encoder (SPS and PPS init and write) ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: set.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/encoder/set.h b/encoder/set.h index 6672b449..b4fa6b1f 100644 --- a/encoder/set.h +++ b/encoder/set.h @@ -1,10 +1,10 @@ /***************************************************************************** * set.h: h264 encoder ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: set.h,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_ENCODER_SET_H diff --git a/encoder/slicetype.c b/encoder/slicetype.c index 27257c60..1777100b 100644 --- a/encoder/slicetype.c +++ b/encoder/slicetype.c @@ -1,9 +1,7 @@ /***************************************************************************** * slicetype.c: h264 encoder library ***************************************************************************** - * Copyright (C) 2005 Loren Merritt - * - * Authors: Loren Merritt + * Copyright (C) 2005-2008 Loren Merritt * * 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 @@ -17,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/extras/getopt.c b/extras/getopt.c index 37c5d21a..a890fde5 100644 --- a/extras/getopt.c +++ b/extras/getopt.c @@ -18,7 +18,7 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */ /* This tells Alpha OSF/1 not to define a getopt prototype in . diff --git a/extras/getopt.h b/extras/getopt.h index 18e10269..e2e40daf 100644 --- a/extras/getopt.h +++ b/extras/getopt.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. */ #ifndef _GETOPT_H diff --git a/gtk/test.c b/gtk/test.c index 81b7e64c..dbb18fd7 100644 --- a/gtk/test.c +++ b/gtk/test.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * test.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #include #include diff --git a/gtk/x264_gtk.c b/gtk/x264_gtk.c index 069f4d2f..355ae670 100644 --- a/gtk/x264_gtk.c +++ b/gtk/x264_gtk.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #include #include #include diff --git a/gtk/x264_gtk.h b/gtk/x264_gtk.h index 7174e6a5..233a5038 100644 --- a/gtk/x264_gtk.h +++ b/gtk/x264_gtk.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_H #define X264_GTK_H diff --git a/gtk/x264_gtk_bitrate.c b/gtk/x264_gtk_bitrate.c index 34fee1fa..fdd88596 100644 --- a/gtk/x264_gtk_bitrate.c +++ b/gtk/x264_gtk_bitrate.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_bitrate.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #if defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __DragonFly__ # include #else diff --git a/gtk/x264_gtk_bitrate.h b/gtk/x264_gtk_bitrate.h index 7f8c07d3..35315f6d 100644 --- a/gtk/x264_gtk_bitrate.h +++ b/gtk/x264_gtk_bitrate.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_bitrate.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_BITRATE_H #define X264_GTK_BITRATE_H diff --git a/gtk/x264_gtk_cqm.c b/gtk/x264_gtk_cqm.c index 28b51ea1..4312f8e5 100644 --- a/gtk/x264_gtk_cqm.c +++ b/gtk/x264_gtk_cqm.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_cqm.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #if defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __DragonFly__ # include #else diff --git a/gtk/x264_gtk_cqm.h b/gtk/x264_gtk_cqm.h index 30118f5d..0ba3dc39 100644 --- a/gtk/x264_gtk_cqm.h +++ b/gtk/x264_gtk_cqm.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_cqm.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_CQM_H #define X264_GTK_CQM_H diff --git a/gtk/x264_gtk_demuxers.h b/gtk/x264_gtk_demuxers.h index de9ab016..638a7af6 100644 --- a/gtk/x264_gtk_demuxers.h +++ b/gtk/x264_gtk_demuxers.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_demuxers.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_MUXERS_H #define X264_GTK_MUXERS_H diff --git a/gtk/x264_gtk_encode.c b/gtk/x264_gtk_encode.c index 8240a516..28c8ee3c 100644 --- a/gtk/x264_gtk_encode.c +++ b/gtk/x264_gtk_encode.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_encode.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #if defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __DragonFly__ # include #else diff --git a/gtk/x264_gtk_encode_encode.c b/gtk/x264_gtk_encode_encode.c index 869fd4f5..f05c0aa1 100644 --- a/gtk/x264_gtk_encode_encode.c +++ b/gtk/x264_gtk_encode_encode.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_encode_encode.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #include #if defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __DragonFly__ # include diff --git a/gtk/x264_gtk_encode_encode.h b/gtk/x264_gtk_encode_encode.h index e1a31b1e..5cc61e0b 100644 --- a/gtk/x264_gtk_encode_encode.h +++ b/gtk/x264_gtk_encode_encode.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_encode_encode.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_ENCODE_ENCODE_H #define X264_GTK_ENCODE_ENCODE_H diff --git a/gtk/x264_gtk_encode_main_window.c b/gtk/x264_gtk_encode_main_window.c index 5dcde210..fe6ac934 100644 --- a/gtk/x264_gtk_encode_main_window.c +++ b/gtk/x264_gtk_encode_main_window.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_encode_main_window.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #if defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __DragonFly__ # include #else diff --git a/gtk/x264_gtk_encode_main_window.h b/gtk/x264_gtk_encode_main_window.h index 6b5ad004..e0a6143e 100644 --- a/gtk/x264_gtk_encode_main_window.h +++ b/gtk/x264_gtk_encode_main_window.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_encode_main_window.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_ENCODE_MAIN_WINDOW_H #define X264_GTK_ENCODE_MAIN_WINDOW_H diff --git a/gtk/x264_gtk_encode_private.h b/gtk/x264_gtk_encode_private.h index 47fc9f88..553cc1c3 100644 --- a/gtk/x264_gtk_encode_private.h +++ b/gtk/x264_gtk_encode_private.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_encode_private.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_ENCODE_PRIVATE_H #define X264_GTK_ENCODE_PRIVATE_H diff --git a/gtk/x264_gtk_encode_status_window.c b/gtk/x264_gtk_encode_status_window.c index e22e1a5a..24e015d8 100644 --- a/gtk/x264_gtk_encode_status_window.c +++ b/gtk/x264_gtk_encode_status_window.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_encode_status_window.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #if defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __DragonFly__ # include #else diff --git a/gtk/x264_gtk_encode_status_window.h b/gtk/x264_gtk_encode_status_window.h index ae657e5d..51b03057 100644 --- a/gtk/x264_gtk_encode_status_window.h +++ b/gtk/x264_gtk_encode_status_window.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_encode_status_window.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_ENCODE_STATUS_WINDOW_H #define X264_GTK_ENCODE_STATUS_WINDOW_H diff --git a/gtk/x264_gtk_enum.h b/gtk/x264_gtk_enum.h index 99e0048c..06e57473 100644 --- a/gtk/x264_gtk_enum.h +++ b/gtk/x264_gtk_enum.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_enum.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_ENUM_H #define X264_GTK_ENUM_H diff --git a/gtk/x264_gtk_i18n.h b/gtk/x264_gtk_i18n.h index 4c528836..60a572e1 100644 --- a/gtk/x264_gtk_i18n.h +++ b/gtk/x264_gtk_i18n.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_i18n.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_I18N_H #define X264_GTK_I18N_H diff --git a/gtk/x264_gtk_mb.c b/gtk/x264_gtk_mb.c index b86cea16..61fda344 100644 --- a/gtk/x264_gtk_mb.c +++ b/gtk/x264_gtk_mb.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_mb.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #include #include "x264_gtk_i18n.h" diff --git a/gtk/x264_gtk_mb.h b/gtk/x264_gtk_mb.h index 8fb20b7e..865735e2 100644 --- a/gtk/x264_gtk_mb.h +++ b/gtk/x264_gtk_mb.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_mb.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_MB_H #define X264_GTK_MB_H diff --git a/gtk/x264_gtk_more.c b/gtk/x264_gtk_more.c index 2b266970..e01adf04 100644 --- a/gtk/x264_gtk_more.c +++ b/gtk/x264_gtk_more.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_more.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #include #include "x264_gtk_i18n.h" diff --git a/gtk/x264_gtk_more.h b/gtk/x264_gtk_more.h index b2401c9b..a4ea3b95 100644 --- a/gtk/x264_gtk_more.h +++ b/gtk/x264_gtk_more.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_more.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_MORE_H #define X264_GTK_MORE_H diff --git a/gtk/x264_gtk_private.h b/gtk/x264_gtk_private.h index aa9d40ed..859da041 100644 --- a/gtk/x264_gtk_private.h +++ b/gtk/x264_gtk_private.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_private.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_PRIVATE_H #define X264_GTK_PRIVATE_H diff --git a/gtk/x264_gtk_rc.c b/gtk/x264_gtk_rc.c index 5222e56a..5f9711be 100644 --- a/gtk/x264_gtk_rc.c +++ b/gtk/x264_gtk_rc.c @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_rc.c: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #include #include "x264_gtk_i18n.h" diff --git a/gtk/x264_gtk_rc.h b/gtk/x264_gtk_rc.h index 558e08c6..1813fade 100644 --- a/gtk/x264_gtk_rc.h +++ b/gtk/x264_gtk_rc.h @@ -1,3 +1,23 @@ +/***************************************************************************** + * x264_gtk_rc.h: h264 gtk encoder frontend + ***************************************************************************** + * Copyright (C) 2006 Vincent Torri + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_GTK_RC_H #define X264_GTK_RC_H diff --git a/matroska.c b/matroska.c index 6cc7df93..b3029c6d 100644 --- a/matroska.c +++ b/matroska.c @@ -1,10 +1,7 @@ /***************************************************************************** * matroska.c: ***************************************************************************** - * Copyright (C) 2005 x264 project - * $Id: $ - * - * Authors: Mike Matsnev + * Copyright (C) 2005 Mike Matsnev * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/matroska.h b/matroska.h index a23c43e6..be6f5300 100644 --- a/matroska.h +++ b/matroska.h @@ -1,10 +1,7 @@ /***************************************************************************** * matroska.h: ***************************************************************************** - * Copyright (C) 2005 x264 project - * $Id: $ - * - * Authors: Mike Matsnev + * Copyright (C) 2005 Mike Matsnev * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_MATROSKA_H diff --git a/muxers.c b/muxers.c index 41b8e7d5..c16b2ffa 100644 --- a/muxers.c +++ b/muxers.c @@ -1,7 +1,10 @@ /***************************************************************************** * muxers.c: h264 file i/o plugins ***************************************************************************** - * Copyright (C) 2003-2006 x264 project + * Copyright (C) 2003-2008 x264 project + * + * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -15,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include "common/common.h" diff --git a/muxers.h b/muxers.h index 372aa639..aaede1c0 100644 --- a/muxers.h +++ b/muxers.h @@ -1,3 +1,26 @@ +/***************************************************************************** + * muxers.c: h264 file i/o plugins + ***************************************************************************** + * Copyright (C) 2003-2008 x264 project + * + * Authors: Laurent Aimar + * Loren Merritt + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #ifndef X264_MUXERS_H #define X264_MUXERS_H diff --git a/tools/avc2avi.c b/tools/avc2avi.c index df1c11e5..09a3e4ae 100644 --- a/tools/avc2avi.c +++ b/tools/avc2avi.c @@ -1,10 +1,10 @@ /***************************************************************************** * avc2avi.c: raw h264 -> AVI ***************************************************************************** - * Copyright (C) 2004 Laurent Aimar - * $Id: avc2avi.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ + * Copyright (C) 2004-2006 x264 project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/tools/checkasm-a.asm b/tools/checkasm-a.asm index e67ad824..eee30327 100644 --- a/tools/checkasm-a.asm +++ b/tools/checkasm-a.asm @@ -1,5 +1,5 @@ ;***************************************************************************** -;* checkasm-32.asm +;* checkasm-a.asm ;***************************************************************************** ;* Copyright (C) 2008 Loren Merritt ;* @@ -15,7 +15,7 @@ ;* ;* You should have received a copy of the GNU General Public License ;* along with this program; if not, write to the Free Software -;* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. ;***************************************************************************** %include "x86inc.asm" diff --git a/tools/checkasm.c b/tools/checkasm.c index 85fce259..bf56c689 100644 --- a/tools/checkasm.c +++ b/tools/checkasm.c @@ -1,3 +1,27 @@ +/***************************************************************************** + * checkasm.c: assembly check tool + ***************************************************************************** + * Copyright (C) 2003-2008 x264 project + * + * Authors: Loren Merritt + * Laurent Aimar + * Fiona Glaser + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + *****************************************************************************/ + #include #include #include diff --git a/tools/xyuv.c b/tools/xyuv.c index 9e84be99..8e806327 100644 --- a/tools/xyuv.c +++ b/tools/xyuv.c @@ -1,10 +1,7 @@ /***************************************************************************** * xyuv.c: a SDL yuv 420 planer viewer. ***************************************************************************** - * Copyright (C) 2004 Laurent Aimar - * $Id: xyuv.c,v 1.1 2004/06/03 19:27:08 fenrir Exp $ - * - * Authors: Laurent Aimar + * Copyright (C) 2004 Laurent Aimar * * 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 @@ -18,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/x264.c b/x264.c index d78461f3..14466e50 100644 --- a/x264.c +++ b/x264.c @@ -1,10 +1,10 @@ /***************************************************************************** * x264: h264 encoder testing program. ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: x264.c,v 1.1 2004/06/03 19:24:12 fenrir Exp $ + * Copyright (C) 2003-2008 x264 project * - * Authors: Laurent Aimar + * Authors: Loren Merritt + * Laurent Aimar * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #include diff --git a/x264.h b/x264.h index 838d5726..3b678dc7 100644 --- a/x264.h +++ b/x264.h @@ -1,10 +1,10 @@ /***************************************************************************** * x264.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: x264.h,v 1.1 2004/06/03 19:24:12 fenrir Exp $ + * Copyright (C) 2003-2008 x264 Project * * Authors: Laurent Aimar + * Loren Merritt * * 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 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. *****************************************************************************/ #ifndef X264_X264_H -- 2.39.2