From 3fa77bde1b1e977b07070c72a9c2aaa5ad7dbf8d Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 28 Nov 2010 10:22:58 +0000 Subject: [PATCH] In libavfilter, use consistently "Copyright (c)" in the license headers. Originally committed as revision 25838 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/allfilters.c | 2 +- libavfilter/avfilter.c | 2 +- libavfilter/avfilter.h | 2 +- libavfilter/avfiltergraph.c | 4 ++-- libavfilter/defaults.c | 2 +- libavfilter/formats.c | 2 +- libavfilter/graphparser.c | 4 ++-- libavfilter/vf_blackframe.c | 8 ++++---- libavfilter/vf_crop.c | 2 +- libavfilter/vf_cropdetect.c | 2 +- libavfilter/vf_drawbox.c | 2 +- libavfilter/vf_fifo.c | 2 +- libavfilter/vf_format.c | 2 +- libavfilter/vf_frei0r.c | 2 +- libavfilter/vf_libopencv.c | 2 +- libavfilter/vf_pad.c | 4 ++-- libavfilter/vf_pixdesctest.c | 3 ++- libavfilter/vf_scale.c | 2 +- libavfilter/vf_settb.c | 2 +- libavfilter/vf_slicify.c | 2 +- libavfilter/vf_transpose.c | 4 ++-- libavfilter/vf_unsharp.c | 8 ++++---- libavfilter/vf_vflip.c | 2 +- 23 files changed, 34 insertions(+), 33 deletions(-) diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9e3ba1435..c3067b85a 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -1,6 +1,6 @@ /* * filter registration - * copyright (c) 2008 Vitor Sessak + * Copyright (c) 2008 Vitor Sessak * * This file is part of FFmpeg. * diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6146a3a06..db254d655 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1,6 +1,6 @@ /* * filter layer - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 0de6c39c9..c5a52e8ce 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -1,6 +1,6 @@ /* * filter layer - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index b138e693f..97dd120d8 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -1,7 +1,7 @@ /* * filter graphs - * copyright (c) 2008 Vitor Sessak - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2008 Vitor Sessak + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 44262ca73..4a48a3aff 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -1,6 +1,6 @@ /* * Filter layer - default implementations - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/formats.c b/libavfilter/formats.c index f53d6baf6..101ef09e5 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -1,6 +1,6 @@ /* * Filter layer - format negotiation - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index e4faa927b..678b7bee7 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -1,7 +1,7 @@ /* * filter graph parser - * copyright (c) 2008 Vitor Sessak - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2008 Vitor Sessak + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index 47ab3cfc1..658c30fd2 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 2010 Stefano Sabatini - * Copyright (C) 2006 Ivo van Poorten - * Copyright (C) 2006 Julian Hall - * Copyright (C) 2002-2003 Brian J. Murrell + * Copyright (c) 2010 Stefano Sabatini + * Copyright (c) 2006 Ivo van Poorten + * Copyright (c) 2006 Julian Hall + * Copyright (c) 2002-2003 Brian J. Murrell * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 0d10febc1..311ee30e7 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index 2fe75308d..62c68640a 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 A'rpi + * Copyright (c) 2002 A'rpi * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or modify diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index 114a2ac83..40d5e16e1 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Affine Systems, Inc (Michael Sullivan, Bobby Impollonia) + * Copyright (c) 2008 Affine Systems, Inc (Michael Sullivan, Bobby Impollonia) * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_fifo.c b/libavfilter/vf_fifo.c index cb9eebf5d..32199eddc 100644 --- a/libavfilter/vf_fifo.c +++ b/libavfilter/vf_fifo.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 5e2c09915..c42e0bb37 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 48f5b4984..a0e27bb62 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2010 Stefano Sabatini + * Copyright (c) 2010 Stefano Sabatini * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index c2b59627a..0eafeb678 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2010 Stefano Sabatini + * Copyright (c) 2010 Stefano Sabatini * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index f86e4c6fb..a661b9cb4 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -1,6 +1,6 @@ /* - * copyright (c) 2008 vmrsss - * copyright (c) 2009 Stefano Sabatini + * Copyright (c) 2008 vmrsss + * Copyright (c) 2009 Stefano Sabatini * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index 1d2f971f0..1fb577e7f 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -1,6 +1,7 @@ /* + * Copyright (c) 2009 Stefano Sabatini + * * This file is part of FFmpeg. - * copyright (C) 2009 Stefano Sabatini * * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index d99e0c1da..100ba2b6b 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c index b5b40bb31..3e48ac419 100644 --- a/libavfilter/vf_settb.c +++ b/libavfilter/vf_settb.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Stefano Sabatini + * Copyright (c) 2010 Stefano Sabatini * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_slicify.c b/libavfilter/vf_slicify.c index 82406fe18..177ac1f2b 100644 --- a/libavfilter/vf_slicify.c +++ b/libavfilter/vf_slicify.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 8d44e56ea..970c38120 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2010 Stefano Sabatini - * Copyright (C) 2008 Vitor Sessak + * Copyright (c) 2010 Stefano Sabatini + * Copyright (c) 2008 Vitor Sessak * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index 5cc5aa19b..7aa7a4365 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -1,7 +1,6 @@ /* - * Ported to FFmpeg from MPlayer libmpcodecs/unsharp.c - * Original copyright (C) 2002 Remi Guyomarch - * Port copyright (C) 2010 Daniel G. Taylor + * Original copyright (c) 2002 Remi Guyomarch + * Port copyright (c) 2010 Daniel G. Taylor * Relicensed to the LGPL with permission from Remi Guyomarch. * * This file is part of FFmpeg. @@ -23,7 +22,8 @@ /** * @file - * blur / sharpen filter + * blur / sharpen filter, ported to FFmpeg from MPlayer + * libmpcodecs/unsharp.c. * * This code is based on: * diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c index 9d5d75ff2..95d90d39e 100644 --- a/libavfilter/vf_vflip.c +++ b/libavfilter/vf_vflip.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2007 Bobby Bingham + * Copyright (c) 2007 Bobby Bingham * * This file is part of FFmpeg. * -- 2.11.0