shithub: opus

Download patch

ref: 8b2ff0da5a768bde0f233ea5384aa9e4edcde9f6
parent: 30f7f813ea48388305f91e4cc961e866d0d0f49a
author: Jean-Marc Valin <[email protected]>
date: Sat Oct 17 17:40:10 EDT 2009

Updated copyright notices

--- a/libcelt/arch.h
+++ b/libcelt/arch.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2003-2008 Jean-Marc Valin */
+/* Copyright (c) 2003-2008 Jean-Marc Valin
+   Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file arch.h
    @brief Various architecture definitions for CELT
--- a/libcelt/bands.c
+++ b/libcelt/bands.c
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-   (C) 2008-2009 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008-2009 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/bands.h
+++ b/libcelt/bands.h
@@ -1,5 +1,7 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008-2009 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-   (C) 2008 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/celt.h
+++ b/libcelt/celt.h
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-   (C) 2008 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /**
   @file celt.h
   @brief Contains all the functions for encoding and decoding audio
--- a/libcelt/celt_header.h
+++ b/libcelt/celt_header.h
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007 CSIRO
+   Copyright (c) 2007-2008 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/cwrs.c
+++ b/libcelt/cwrs.c
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2007-2009 Timothy B. Terriberry
+   Written by Timothy B. Terriberry and Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/cwrs.h
+++ b/libcelt/cwrs.h
@@ -1,4 +1,7 @@
-/* (C) 2007-2008 Timothy Terriberry */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2007-2009 Timothy B. Terriberry
+   Written by Timothy B. Terriberry and Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/dump_modes.c
+++ b/libcelt/dump_modes.c
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2008 CSIRO
+   Copyright (c) 2008-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/ecintrin.h
+++ b/libcelt/ecintrin.h
@@ -1,5 +1,5 @@
-/* (C) 2003-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2003-2008 Timothy B. Terriberry
+   Copyright (c) 2008 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/entcode.c
+++ b/libcelt/entcode.c
@@ -1,4 +1,4 @@
-/* (C) 2001-2008 Timothy B. Terriberry
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
 */
 /*
    Redistribution and use in source and binary forms, with or without
--- a/libcelt/entcode.h
+++ b/libcelt/entcode.h
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/entdec.c
+++ b/libcelt/entdec.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/entdec.h
+++ b/libcelt/entdec.h
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/entenc.c
+++ b/libcelt/entenc.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/entenc.h
+++ b/libcelt/entenc.h
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/fixed_debug.h
+++ b/libcelt/fixed_debug.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003-2008 Jean-Marc Valin */
+/* Copyright (C) 2003-2008 Jean-Marc Valin
+   Copyright (C) 2007-2009 Xiph.Org Foundation */
 /**
    @file fixed_debug.h
    @brief Fixed-point operations with debugging
--- a/libcelt/fixed_generic.h
+++ b/libcelt/fixed_generic.h
@@ -1,4 +1,6 @@
-/* Copyright (C) 2003-2008 Jean-Marc Valin, CSIRO */
+/* Copyright (C) 2007-2009 Xiph.Org Foundation
+   Copyright (C) 2003-2008 Jean-Marc Valin
+   Copyright (C) 2007-2008 CSIRO */
 /**
    @file fixed_generic.h
    @brief Generic fixed-point operations
--- a/libcelt/header.c
+++ b/libcelt/header.c
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/kfft_double.h
+++ b/libcelt/kfft_double.h
@@ -1,4 +1,4 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
+/* Copyright (c) 2008 Xiph.Org Foundation, CSIRO
 */
 /*
    Redistribution and use in source and binary forms, with or without
--- a/libcelt/kfft_single.c
+++ b/libcelt/kfft_single.c
@@ -1,4 +1,4 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
+/* Copyright (c) 2008 Xiph.Org Foundation, CSIRO
 */
 /*
    Redistribution and use in source and binary forms, with or without
--- a/libcelt/kfft_single.h
+++ b/libcelt/kfft_single.h
@@ -1,4 +1,4 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
+/* Copyright (c) 2008 Xiph.Org Foundation, CSIRO
 */
 /*
    Redistribution and use in source and binary forms, with or without
--- a/libcelt/kiss_fft.c
+++ b/libcelt/kiss_fft.c
@@ -1,8 +1,8 @@
 /*
 Copyright (c) 2003-2004, Mark Borgerding
-Lots of modifications by JMV
-Copyright (c) 2005-2007, Jean-Marc Valin
-Copyright (c) 2008,      Jean-Marc Valin, CSIRO
+Lots of modifications by Jean-Marc Valin
+Copyright (c) 2005-2007, Xiph.Org Foundation
+Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
 
 All rights reserved.
 
--- a/libcelt/kiss_fft.h
+++ b/libcelt/kiss_fft.h
@@ -1,8 +1,8 @@
 /*
 Copyright (c) 2003-2004, Mark Borgerding
-Lots of modifications by JMV
-Copyright (c) 2005-2007, Jean-Marc Valin
-Copyright (c) 2008,      Jean-Marc Valin, CSIRO
+Lots of modifications by Jean-Marc Valin
+Copyright (c) 2005-2007, Xiph.Org Foundation
+Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
 
 All rights reserved.
 
--- a/libcelt/laplace.c
+++ b/libcelt/laplace.c
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/laplace.h
+++ b/libcelt/laplace.h
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/mathops.h
+++ b/libcelt/mathops.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2002-2008 Jean-Marc Valin */
+/* Copyright (c) 2002-2008 Jean-Marc Valin
+   Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file mathops.h
    @brief Various math functions
--- a/libcelt/mdct.c
+++ b/libcelt/mdct.c
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2008 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/mdct.h
+++ b/libcelt/mdct.h
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2008 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/mfrngcod.h
+++ b/libcelt/mfrngcod.h
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/mfrngdec.c
+++ b/libcelt/mfrngdec.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/mfrngenc.c
+++ b/libcelt/mfrngenc.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/modes.c
+++ b/libcelt/modes.c
@@ -1,5 +1,7 @@
-/* (C) 2007-2009 Jean-Marc Valin, CSIRO
-   (C) 2008 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/modes.h
+++ b/libcelt/modes.h
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/pitch.c
+++ b/libcelt/pitch.c
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file pitch.c
    @brief Pitch analysis
--- a/libcelt/pitch.h
+++ b/libcelt/pitch.h
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file pitch.h
    @brief Pitch analysis
--- a/libcelt/psy.c
+++ b/libcelt/psy.c
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/psy.h
+++ b/libcelt/psy.h
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/quant_bands.c
+++ b/libcelt/quant_bands.c
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/quant_bands.h
+++ b/libcelt/quant_bands.h
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-  */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/rangedec.c
+++ b/libcelt/rangedec.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/rangeenc.c
+++ b/libcelt/rangeenc.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/rate.c
+++ b/libcelt/rate.c
@@ -1,5 +1,6 @@
-/* (C) 2007-2009 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/rate.h
+++ b/libcelt/rate.h
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/stack_alloc.h
+++ b/libcelt/stack_alloc.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
+/* Copyright (C) 2002-2003 Jean-Marc Valin
+   Copyright (C) 2007-2009 Xiph.Org Foundation */
 /**
    @file stack_alloc.h
    @brief Temporary memory allocation on stack
--- a/libcelt/testcelt.c
+++ b/libcelt/testcelt.c
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/vq.c
+++ b/libcelt/vq.c
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/libcelt/vq.h
+++ b/libcelt/vq.h
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file vq.h
    @brief Vector quantisation of the residual
--- a/tools/celtclient.c
+++ b/tools/celtclient.c
@@ -3,6 +3,7 @@
    Copyright (C) 2006 Commonwealth Scientific and Industrial Research
                       Organisation (CSIRO) Australia
    Copyright (C) 2008-2009 Gregory Maxwell
+   Copyright (c) 2007-2009 Xiph.Org Foundation
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
--- a/tools/celtdec.c
+++ b/tools/celtdec.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 Jean-Marc Valin, CSIRO
+/* Copyright (c) 2002-2007 Jean-Marc Valin
+   Copyright (c) 2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
    File: celtdec.c
 
    Redistribution and use in source and binary forms, with or without
--- a/tools/celtenc.c
+++ b/tools/celtenc.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 2002-2008 Jean-Marc Valin 
-   Copyright (C) 2008-2009 Gregory Maxwell
+/* Copyright (c) 2002-2007 Jean-Marc Valin 
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008-2009 Gregory Maxwell
    File: celtenc.c
 
    Redistribution and use in source and binary forms, with or without