| Message ID | GV1P250MB07376FEEDC64A44A288B10FB8FEB2@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,RFC] all: Adapt BSD license headers to avoid fate-source exceptions | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
Andreas Rheinhardt: > This is against the 80 char line length limit, but it is not > a hard rule anyway. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > This is an alternative to modifying check-source.sh (for which I also > sent a patch). > > doc/mips.txt | 5 ++--- > libavcodec/aacsbr_fixed.c | 5 ++--- > libavcodec/ac3dec_fixed.c | 5 ++--- > libavcodec/aom_film_grain_template.c | 4 ++-- > libavcodec/arm/vp8dsp_armv6.S | 5 ++--- > libavcodec/ilbcdata.h | 5 ++--- > libavcodec/ilbcdec.c | 5 ++--- > libavcodec/j2kenc.c | 5 ++--- > libavcodec/mips/ac3dsp_mips.c | 5 ++--- > libavcodec/mips/acelp_filters_mips.c | 5 ++--- > libavcodec/mips/acelp_vectors_mips.c | 5 ++--- > libavcodec/mips/amrwbdec_mips.c | 5 ++--- > libavcodec/mips/amrwbdec_mips.h | 5 ++--- > libavcodec/mips/celp_filters_mips.c | 5 ++--- > libavcodec/mips/celp_math_mips.c | 5 ++--- > libavcodec/mips/compute_antialias_fixed.h | 5 ++--- > libavcodec/mips/compute_antialias_float.h | 5 ++--- > libavcodec/mips/fmtconvert_mips.c | 5 ++--- > libavcodec/mips/iirfilter_mips.c | 5 ++--- > libavcodec/mips/lsp_mips.h | 5 ++--- > libavcodec/mips/mpegaudiodsp_mips_fixed.c | 5 ++--- > libavcodec/mips/mpegaudiodsp_mips_float.c | 5 ++--- > libavcodec/riscv/startcode_rvb.S | 4 ++-- > libavcodec/riscv/startcode_rvv.S | 4 ++-- > libavcodec/speexdata.h | 5 ++--- > libavcodec/speexdec.c | 5 ++--- > libavcodec/vvc/itx_1d.c | 4 ++-- > libavfilter/af_arnndn.c | 5 ++--- > libavformat/imf.h | 4 ++-- > libavformat/imf_cpl.c | 4 ++-- > libavformat/imfdec.c | 4 ++-- > libavformat/tests/imf.c | 4 ++-- > libavutil/fixed_dsp.c | 5 ++--- > libavutil/fixed_dsp.h | 5 ++--- > libavutil/mips/float_dsp_mips.c | 5 ++--- > libavutil/mips/libm_mips.h | 5 ++--- > libavutil/softfloat_tables.h | 5 ++--- > libavutil/uuid.c | 5 ++--- > tests/ref/fate/source | 5 ----- > 39 files changed, 76 insertions(+), 111 deletions(-) > > diff --git a/doc/mips.txt b/doc/mips.txt > index d66ce3b447..65ae48cf1d 100644 > --- a/doc/mips.txt > +++ b/doc/mips.txt > @@ -15,9 +15,8 @@ Example of copyright notice: > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c > index 06d07e1941..422bb21c20 100644 > --- a/libavcodec/aacsbr_fixed.c > +++ b/libavcodec/aacsbr_fixed.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2013 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c > index c9e5cda69c..59b7492733 100644 > --- a/libavcodec/ac3dec_fixed.c > +++ b/libavcodec/ac3dec_fixed.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/aom_film_grain_template.c b/libavcodec/aom_film_grain_template.c > index 5f9f29f1fa..e510b5c6a7 100644 > --- a/libavcodec/aom_film_grain_template.c > +++ b/libavcodec/aom_film_grain_template.c > @@ -25,8 +25,8 @@ > * Copyright © 2018, Two Orioles, LLC > * All rights reserved. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * 1. Redistributions of source code must retain the above copyright notice, this > * list of conditions and the following disclaimer. > diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S > index 395debe866..a815915909 100644 > --- a/libavcodec/arm/vp8dsp_armv6.S > +++ b/libavcodec/arm/vp8dsp_armv6.S > @@ -23,9 +23,8 @@ > * > * This code was partially ported from libvpx, which uses this license: > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are > - * met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * * Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > diff --git a/libavcodec/ilbcdata.h b/libavcodec/ilbcdata.h > index b17e24df5f..f477ea6a09 100644 > --- a/libavcodec/ilbcdata.h > +++ b/libavcodec/ilbcdata.h > @@ -1,9 +1,8 @@ > /* > * Copyright (c) 2013, The WebRTC project authors. All rights reserved. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are > - * met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * * Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c > index 4ecdff4183..9234b82e20 100644 > --- a/libavcodec/ilbcdec.c > +++ b/libavcodec/ilbcdec.c > @@ -1,9 +1,8 @@ > /* > * Copyright (c) 2013, The WebRTC project authors. All rights reserved. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are > - * met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * * Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c > index 8cf82f7216..d6ec6250a9 100644 > --- a/libavcodec/j2kenc.c > +++ b/libavcodec/j2kenc.c > @@ -35,9 +35,8 @@ > * Copyright (c) 2020, Gautam Ramakrishnan <gautamramk@gmail.com> > * All rights reserved. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/ac3dsp_mips.c b/libavcodec/mips/ac3dsp_mips.c > index cc49ba3888..042af32634 100644 > --- a/libavcodec/mips/ac3dsp_mips.c > +++ b/libavcodec/mips/ac3dsp_mips.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/acelp_filters_mips.c b/libavcodec/mips/acelp_filters_mips.c > index 478db855b2..a5918c4300 100644 > --- a/libavcodec/mips/acelp_filters_mips.c > +++ b/libavcodec/mips/acelp_filters_mips.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/acelp_vectors_mips.c b/libavcodec/mips/acelp_vectors_mips.c > index 0ab2b6a87b..02f6227f6f 100644 > --- a/libavcodec/mips/acelp_vectors_mips.c > +++ b/libavcodec/mips/acelp_vectors_mips.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/amrwbdec_mips.c b/libavcodec/mips/amrwbdec_mips.c > index 5dc054361b..264d75f8aa 100644 > --- a/libavcodec/mips/amrwbdec_mips.c > +++ b/libavcodec/mips/amrwbdec_mips.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/amrwbdec_mips.h b/libavcodec/mips/amrwbdec_mips.h > index a9f66fef94..a1af035675 100644 > --- a/libavcodec/mips/amrwbdec_mips.h > +++ b/libavcodec/mips/amrwbdec_mips.h > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/celp_filters_mips.c b/libavcodec/mips/celp_filters_mips.c > index 926f1cb334..990e8cf1e5 100644 > --- a/libavcodec/mips/celp_filters_mips.c > +++ b/libavcodec/mips/celp_filters_mips.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/celp_math_mips.c b/libavcodec/mips/celp_math_mips.c > index ce711bd63c..9a9958f12c 100644 > --- a/libavcodec/mips/celp_math_mips.c > +++ b/libavcodec/mips/celp_math_mips.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/compute_antialias_fixed.h b/libavcodec/mips/compute_antialias_fixed.h > index 982002ad4c..027021f91e 100644 > --- a/libavcodec/mips/compute_antialias_fixed.h > +++ b/libavcodec/mips/compute_antialias_fixed.h > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/compute_antialias_float.h b/libavcodec/mips/compute_antialias_float.h > index 633eb9589d..70b9677bff 100644 > --- a/libavcodec/mips/compute_antialias_float.h > +++ b/libavcodec/mips/compute_antialias_float.h > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/fmtconvert_mips.c b/libavcodec/mips/fmtconvert_mips.c > index c39e853575..20303f8fd6 100644 > --- a/libavcodec/mips/fmtconvert_mips.c > +++ b/libavcodec/mips/fmtconvert_mips.c > @@ -4,9 +4,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/iirfilter_mips.c b/libavcodec/mips/iirfilter_mips.c > index 3a1352a7e4..06fc655665 100644 > --- a/libavcodec/mips/iirfilter_mips.c > +++ b/libavcodec/mips/iirfilter_mips.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/lsp_mips.h b/libavcodec/mips/lsp_mips.h > index 2d67403888..2cd31cb186 100644 > --- a/libavcodec/mips/lsp_mips.h > +++ b/libavcodec/mips/lsp_mips.h > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/mpegaudiodsp_mips_fixed.c b/libavcodec/mips/mpegaudiodsp_mips_fixed.c > index ef9750a44e..1207f11bfa 100644 > --- a/libavcodec/mips/mpegaudiodsp_mips_fixed.c > +++ b/libavcodec/mips/mpegaudiodsp_mips_fixed.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/mips/mpegaudiodsp_mips_float.c b/libavcodec/mips/mpegaudiodsp_mips_float.c > index 53b77619c9..31937166fb 100644 > --- a/libavcodec/mips/mpegaudiodsp_mips_float.c > +++ b/libavcodec/mips/mpegaudiodsp_mips_float.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavcodec/riscv/startcode_rvb.S b/libavcodec/riscv/startcode_rvb.S > index c043d59809..821a0bbc4e 100644 > --- a/libavcodec/riscv/startcode_rvb.S > +++ b/libavcodec/riscv/startcode_rvb.S > @@ -1,8 +1,8 @@ > /* > * Copyright © 2024 Rémi Denis-Courmont. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * 1. Redistributions of source code must retain the above copyright notice, > * this list of conditions and the following disclaimer. > diff --git a/libavcodec/riscv/startcode_rvv.S b/libavcodec/riscv/startcode_rvv.S > index 7c43b1d7f3..16abb26955 100644 > --- a/libavcodec/riscv/startcode_rvv.S > +++ b/libavcodec/riscv/startcode_rvv.S > @@ -1,8 +1,8 @@ > /* > * Copyright © 2024 Rémi Denis-Courmont. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * 1. Redistributions of source code must retain the above copyright notice, > * this list of conditions and the following disclaimer. > diff --git a/libavcodec/speexdata.h b/libavcodec/speexdata.h > index 476a8c11c6..a7875ae62e 100644 > --- a/libavcodec/speexdata.h > +++ b/libavcodec/speexdata.h > @@ -7,9 +7,8 @@ > * Copyright 2003 EpicGames > * Copyright 1992-1994 Jutta Degener, Carsten Bormann > > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > > * - Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c > index d25823ef6e..f5ec268f9a 100644 > --- a/libavcodec/speexdec.c > +++ b/libavcodec/speexdec.c > @@ -7,9 +7,8 @@ > * Copyright 2003 EpicGames > * Copyright 1992-1994 Jutta Degener, Carsten Bormann > > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > > * - Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > diff --git a/libavcodec/vvc/itx_1d.c b/libavcodec/vvc/itx_1d.c > index c84e39440a..94e1892c1b 100644 > --- a/libavcodec/vvc/itx_1d.c > +++ b/libavcodec/vvc/itx_1d.c > @@ -28,8 +28,8 @@ > * Copyright (c) 2010-2021, ITU/ISO/IEC > * All rights reserved. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * * Redistributions of source code must retain the above copyright notice, > * this list of conditions and the following disclaimer. > diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c > index b29af87df9..f57e5c3da2 100644 > --- a/libavfilter/af_arnndn.c > +++ b/libavfilter/af_arnndn.c > @@ -7,9 +7,8 @@ > * Copyright (c) Jean-Marc Valin > * Copyright (c) 2019 Paul B Mahol > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * - Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > diff --git a/libavformat/imf.h b/libavformat/imf.h > index ef124bf412..03e4720d6a 100644 > --- a/libavformat/imf.h > +++ b/libavformat/imf.h > @@ -20,8 +20,8 @@ > * > * Copyright (c) Sandflow Consulting LLC > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * * Redistributions of source code must retain the above copyright notice, this > * list of conditions and the following disclaimer. > diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c > index 137cff2a63..fd72b72dd1 100644 > --- a/libavformat/imf_cpl.c > +++ b/libavformat/imf_cpl.c > @@ -20,8 +20,8 @@ > * > * Copyright (c) Sandflow Consulting LLC > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * * Redistributions of source code must retain the above copyright notice, this > * list of conditions and the following disclaimer. > diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c > index 32208f89cc..781ad64625 100644 > --- a/libavformat/imfdec.c > +++ b/libavformat/imfdec.c > @@ -20,8 +20,8 @@ > * > * Copyright (c) Sandflow Consulting LLC > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * * Redistributions of source code must retain the above copyright notice, this > * list of conditions and the following disclaimer. > diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c > index 92d1052a1d..7e2547afb7 100644 > --- a/libavformat/tests/imf.c > +++ b/libavformat/tests/imf.c > @@ -20,8 +20,8 @@ > * > * Copyright (c) Sandflow Consulting LLC > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * > * * Redistributions of source code must retain the above copyright notice, this > * list of conditions and the following disclaimer. > diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c > index 95f0eb2595..290822c914 100644 > --- a/libavutil/fixed_dsp.c > +++ b/libavutil/fixed_dsp.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavutil/fixed_dsp.h b/libavutil/fixed_dsp.h > index 9b566af675..b2a58422b7 100644 > --- a/libavutil/fixed_dsp.h > +++ b/libavutil/fixed_dsp.h > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavutil/mips/float_dsp_mips.c b/libavutil/mips/float_dsp_mips.c > index 8f31b9171b..9996e2bf77 100644 > --- a/libavutil/mips/float_dsp_mips.c > +++ b/libavutil/mips/float_dsp_mips.c > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavutil/mips/libm_mips.h b/libavutil/mips/libm_mips.h > index fbf7cf41cc..9b7694f596 100644 > --- a/libavutil/mips/libm_mips.h > +++ b/libavutil/mips/libm_mips.h > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavutil/softfloat_tables.h b/libavutil/softfloat_tables.h > index 461f2b221d..4665acbbb7 100644 > --- a/libavutil/softfloat_tables.h > +++ b/libavutil/softfloat_tables.h > @@ -2,9 +2,8 @@ > * Copyright (c) 2012 > * MIPS Technologies, Inc., California. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, this list of conditions and the following disclaimer. > * 2. Redistributions in binary form must reproduce the above copyright > diff --git a/libavutil/uuid.c b/libavutil/uuid.c > index 062e28736b..bebd4dcb1a 100644 > --- a/libavutil/uuid.c > +++ b/libavutil/uuid.c > @@ -22,9 +22,8 @@ > /* > * Copyright (C) 1996, 1997 Theodore Ts'o. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > + * Redistribution and use in source and binary forms, with or without modification, > + * are permitted provided that the following conditions are met: > * 1. Redistributions of source code must retain the above copyright > * notice, and the entire permission notice in its entirety, > * including the disclaimer of warranties. > diff --git a/tests/ref/fate/source b/tests/ref/fate/source > index 723e2e06c7..a3beb35093 100644 > --- a/tests/ref/fate/source > +++ b/tests/ref/fate/source > @@ -1,15 +1,10 @@ > Files without standard license headers: > libavcodec/file_open.c > -libavcodec/ilbcdata.h > -libavcodec/ilbcdec.c > libavcodec/interplayacm.c > libavcodec/log2_tab.c > libavcodec/reverse.c > -libavcodec/riscv/startcode_rvb.S > -libavcodec/riscv/startcode_rvv.S > libavdevice/file_open.c > libavdevice/reverse.c > -libavfilter/af_arnndn.c > libavfilter/file_open.c > libavfilter/log2_tab.c > libavformat/bitstream.c Ping for this and the alternative (which changes the check and has already been LGTM'ed by courmisch; see https://ffmpeg.org/pipermail/ffmpeg-devel/2024-May/327948.html). Will apply the solution with more LGTMs in two days unless there are objections (or unless it is a tie). - Andreas
On Sat, May 25, 2024 at 7:57 AM Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote: > > Andreas Rheinhardt: > > This is against the 80 char line length limit, but it is not > > a hard rule anyway. > > > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > > --- > > This is an alternative to modifying check-source.sh (for which I also > > sent a patch). > > > > doc/mips.txt | 5 ++--- > > libavcodec/aacsbr_fixed.c | 5 ++--- > > libavcodec/ac3dec_fixed.c | 5 ++--- > > libavcodec/aom_film_grain_template.c | 4 ++-- > > libavcodec/arm/vp8dsp_armv6.S | 5 ++--- > > libavcodec/ilbcdata.h | 5 ++--- > > libavcodec/ilbcdec.c | 5 ++--- > > libavcodec/j2kenc.c | 5 ++--- > > libavcodec/mips/ac3dsp_mips.c | 5 ++--- > > libavcodec/mips/acelp_filters_mips.c | 5 ++--- > > libavcodec/mips/acelp_vectors_mips.c | 5 ++--- > > libavcodec/mips/amrwbdec_mips.c | 5 ++--- > > libavcodec/mips/amrwbdec_mips.h | 5 ++--- > > libavcodec/mips/celp_filters_mips.c | 5 ++--- > > libavcodec/mips/celp_math_mips.c | 5 ++--- > > libavcodec/mips/compute_antialias_fixed.h | 5 ++--- > > libavcodec/mips/compute_antialias_float.h | 5 ++--- > > libavcodec/mips/fmtconvert_mips.c | 5 ++--- > > libavcodec/mips/iirfilter_mips.c | 5 ++--- > > libavcodec/mips/lsp_mips.h | 5 ++--- > > libavcodec/mips/mpegaudiodsp_mips_fixed.c | 5 ++--- > > libavcodec/mips/mpegaudiodsp_mips_float.c | 5 ++--- > > libavcodec/riscv/startcode_rvb.S | 4 ++-- > > libavcodec/riscv/startcode_rvv.S | 4 ++-- > > libavcodec/speexdata.h | 5 ++--- > > libavcodec/speexdec.c | 5 ++--- > > libavcodec/vvc/itx_1d.c | 4 ++-- > > libavfilter/af_arnndn.c | 5 ++--- > > libavformat/imf.h | 4 ++-- > > libavformat/imf_cpl.c | 4 ++-- > > libavformat/imfdec.c | 4 ++-- > > libavformat/tests/imf.c | 4 ++-- > > libavutil/fixed_dsp.c | 5 ++--- > > libavutil/fixed_dsp.h | 5 ++--- > > libavutil/mips/float_dsp_mips.c | 5 ++--- > > libavutil/mips/libm_mips.h | 5 ++--- > > libavutil/softfloat_tables.h | 5 ++--- > > libavutil/uuid.c | 5 ++--- > > tests/ref/fate/source | 5 ----- > > 39 files changed, 76 insertions(+), 111 deletions(-) > > > > diff --git a/doc/mips.txt b/doc/mips.txt > > index d66ce3b447..65ae48cf1d 100644 > > --- a/doc/mips.txt > > +++ b/doc/mips.txt > > @@ -15,9 +15,8 @@ Example of copyright notice: > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c > > index 06d07e1941..422bb21c20 100644 > > --- a/libavcodec/aacsbr_fixed.c > > +++ b/libavcodec/aacsbr_fixed.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2013 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c > > index c9e5cda69c..59b7492733 100644 > > --- a/libavcodec/ac3dec_fixed.c > > +++ b/libavcodec/ac3dec_fixed.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/aom_film_grain_template.c b/libavcodec/aom_film_grain_template.c > > index 5f9f29f1fa..e510b5c6a7 100644 > > --- a/libavcodec/aom_film_grain_template.c > > +++ b/libavcodec/aom_film_grain_template.c > > @@ -25,8 +25,8 @@ > > * Copyright © 2018, Two Orioles, LLC > > * All rights reserved. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * 1. Redistributions of source code must retain the above copyright notice, this > > * list of conditions and the following disclaimer. > > diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S > > index 395debe866..a815915909 100644 > > --- a/libavcodec/arm/vp8dsp_armv6.S > > +++ b/libavcodec/arm/vp8dsp_armv6.S > > @@ -23,9 +23,8 @@ > > * > > * This code was partially ported from libvpx, which uses this license: > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are > > - * met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * * Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > diff --git a/libavcodec/ilbcdata.h b/libavcodec/ilbcdata.h > > index b17e24df5f..f477ea6a09 100644 > > --- a/libavcodec/ilbcdata.h > > +++ b/libavcodec/ilbcdata.h > > @@ -1,9 +1,8 @@ > > /* > > * Copyright (c) 2013, The WebRTC project authors. All rights reserved. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are > > - * met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * * Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c > > index 4ecdff4183..9234b82e20 100644 > > --- a/libavcodec/ilbcdec.c > > +++ b/libavcodec/ilbcdec.c > > @@ -1,9 +1,8 @@ > > /* > > * Copyright (c) 2013, The WebRTC project authors. All rights reserved. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are > > - * met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * * Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c > > index 8cf82f7216..d6ec6250a9 100644 > > --- a/libavcodec/j2kenc.c > > +++ b/libavcodec/j2kenc.c > > @@ -35,9 +35,8 @@ > > * Copyright (c) 2020, Gautam Ramakrishnan <gautamramk@gmail.com> > > * All rights reserved. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/ac3dsp_mips.c b/libavcodec/mips/ac3dsp_mips.c > > index cc49ba3888..042af32634 100644 > > --- a/libavcodec/mips/ac3dsp_mips.c > > +++ b/libavcodec/mips/ac3dsp_mips.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/acelp_filters_mips.c b/libavcodec/mips/acelp_filters_mips.c > > index 478db855b2..a5918c4300 100644 > > --- a/libavcodec/mips/acelp_filters_mips.c > > +++ b/libavcodec/mips/acelp_filters_mips.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/acelp_vectors_mips.c b/libavcodec/mips/acelp_vectors_mips.c > > index 0ab2b6a87b..02f6227f6f 100644 > > --- a/libavcodec/mips/acelp_vectors_mips.c > > +++ b/libavcodec/mips/acelp_vectors_mips.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/amrwbdec_mips.c b/libavcodec/mips/amrwbdec_mips.c > > index 5dc054361b..264d75f8aa 100644 > > --- a/libavcodec/mips/amrwbdec_mips.c > > +++ b/libavcodec/mips/amrwbdec_mips.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/amrwbdec_mips.h b/libavcodec/mips/amrwbdec_mips.h > > index a9f66fef94..a1af035675 100644 > > --- a/libavcodec/mips/amrwbdec_mips.h > > +++ b/libavcodec/mips/amrwbdec_mips.h > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/celp_filters_mips.c b/libavcodec/mips/celp_filters_mips.c > > index 926f1cb334..990e8cf1e5 100644 > > --- a/libavcodec/mips/celp_filters_mips.c > > +++ b/libavcodec/mips/celp_filters_mips.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/celp_math_mips.c b/libavcodec/mips/celp_math_mips.c > > index ce711bd63c..9a9958f12c 100644 > > --- a/libavcodec/mips/celp_math_mips.c > > +++ b/libavcodec/mips/celp_math_mips.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/compute_antialias_fixed.h b/libavcodec/mips/compute_antialias_fixed.h > > index 982002ad4c..027021f91e 100644 > > --- a/libavcodec/mips/compute_antialias_fixed.h > > +++ b/libavcodec/mips/compute_antialias_fixed.h > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/compute_antialias_float.h b/libavcodec/mips/compute_antialias_float.h > > index 633eb9589d..70b9677bff 100644 > > --- a/libavcodec/mips/compute_antialias_float.h > > +++ b/libavcodec/mips/compute_antialias_float.h > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/fmtconvert_mips.c b/libavcodec/mips/fmtconvert_mips.c > > index c39e853575..20303f8fd6 100644 > > --- a/libavcodec/mips/fmtconvert_mips.c > > +++ b/libavcodec/mips/fmtconvert_mips.c > > @@ -4,9 +4,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/iirfilter_mips.c b/libavcodec/mips/iirfilter_mips.c > > index 3a1352a7e4..06fc655665 100644 > > --- a/libavcodec/mips/iirfilter_mips.c > > +++ b/libavcodec/mips/iirfilter_mips.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/lsp_mips.h b/libavcodec/mips/lsp_mips.h > > index 2d67403888..2cd31cb186 100644 > > --- a/libavcodec/mips/lsp_mips.h > > +++ b/libavcodec/mips/lsp_mips.h > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/mpegaudiodsp_mips_fixed.c b/libavcodec/mips/mpegaudiodsp_mips_fixed.c > > index ef9750a44e..1207f11bfa 100644 > > --- a/libavcodec/mips/mpegaudiodsp_mips_fixed.c > > +++ b/libavcodec/mips/mpegaudiodsp_mips_fixed.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/mips/mpegaudiodsp_mips_float.c b/libavcodec/mips/mpegaudiodsp_mips_float.c > > index 53b77619c9..31937166fb 100644 > > --- a/libavcodec/mips/mpegaudiodsp_mips_float.c > > +++ b/libavcodec/mips/mpegaudiodsp_mips_float.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavcodec/riscv/startcode_rvb.S b/libavcodec/riscv/startcode_rvb.S > > index c043d59809..821a0bbc4e 100644 > > --- a/libavcodec/riscv/startcode_rvb.S > > +++ b/libavcodec/riscv/startcode_rvb.S > > @@ -1,8 +1,8 @@ > > /* > > * Copyright © 2024 Rémi Denis-Courmont. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * 1. Redistributions of source code must retain the above copyright notice, > > * this list of conditions and the following disclaimer. > > diff --git a/libavcodec/riscv/startcode_rvv.S b/libavcodec/riscv/startcode_rvv.S > > index 7c43b1d7f3..16abb26955 100644 > > --- a/libavcodec/riscv/startcode_rvv.S > > +++ b/libavcodec/riscv/startcode_rvv.S > > @@ -1,8 +1,8 @@ > > /* > > * Copyright © 2024 Rémi Denis-Courmont. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * 1. Redistributions of source code must retain the above copyright notice, > > * this list of conditions and the following disclaimer. > > diff --git a/libavcodec/speexdata.h b/libavcodec/speexdata.h > > index 476a8c11c6..a7875ae62e 100644 > > --- a/libavcodec/speexdata.h > > +++ b/libavcodec/speexdata.h > > @@ -7,9 +7,8 @@ > > * Copyright 2003 EpicGames > > * Copyright 1992-1994 Jutta Degener, Carsten Bormann > > > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > > > * - Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c > > index d25823ef6e..f5ec268f9a 100644 > > --- a/libavcodec/speexdec.c > > +++ b/libavcodec/speexdec.c > > @@ -7,9 +7,8 @@ > > * Copyright 2003 EpicGames > > * Copyright 1992-1994 Jutta Degener, Carsten Bormann > > > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > > > * - Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > diff --git a/libavcodec/vvc/itx_1d.c b/libavcodec/vvc/itx_1d.c > > index c84e39440a..94e1892c1b 100644 > > --- a/libavcodec/vvc/itx_1d.c > > +++ b/libavcodec/vvc/itx_1d.c > > @@ -28,8 +28,8 @@ > > * Copyright (c) 2010-2021, ITU/ISO/IEC > > * All rights reserved. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * * Redistributions of source code must retain the above copyright notice, > > * this list of conditions and the following disclaimer. > > diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c > > index b29af87df9..f57e5c3da2 100644 > > --- a/libavfilter/af_arnndn.c > > +++ b/libavfilter/af_arnndn.c > > @@ -7,9 +7,8 @@ > > * Copyright (c) Jean-Marc Valin > > * Copyright (c) 2019 Paul B Mahol > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * - Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > diff --git a/libavformat/imf.h b/libavformat/imf.h > > index ef124bf412..03e4720d6a 100644 > > --- a/libavformat/imf.h > > +++ b/libavformat/imf.h > > @@ -20,8 +20,8 @@ > > * > > * Copyright (c) Sandflow Consulting LLC > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * * Redistributions of source code must retain the above copyright notice, this > > * list of conditions and the following disclaimer. > > diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c > > index 137cff2a63..fd72b72dd1 100644 > > --- a/libavformat/imf_cpl.c > > +++ b/libavformat/imf_cpl.c > > @@ -20,8 +20,8 @@ > > * > > * Copyright (c) Sandflow Consulting LLC > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * * Redistributions of source code must retain the above copyright notice, this > > * list of conditions and the following disclaimer. > > diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c > > index 32208f89cc..781ad64625 100644 > > --- a/libavformat/imfdec.c > > +++ b/libavformat/imfdec.c > > @@ -20,8 +20,8 @@ > > * > > * Copyright (c) Sandflow Consulting LLC > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * * Redistributions of source code must retain the above copyright notice, this > > * list of conditions and the following disclaimer. > > diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c > > index 92d1052a1d..7e2547afb7 100644 > > --- a/libavformat/tests/imf.c > > +++ b/libavformat/tests/imf.c > > @@ -20,8 +20,8 @@ > > * > > * Copyright (c) Sandflow Consulting LLC > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * > > * * Redistributions of source code must retain the above copyright notice, this > > * list of conditions and the following disclaimer. > > diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c > > index 95f0eb2595..290822c914 100644 > > --- a/libavutil/fixed_dsp.c > > +++ b/libavutil/fixed_dsp.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavutil/fixed_dsp.h b/libavutil/fixed_dsp.h > > index 9b566af675..b2a58422b7 100644 > > --- a/libavutil/fixed_dsp.h > > +++ b/libavutil/fixed_dsp.h > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavutil/mips/float_dsp_mips.c b/libavutil/mips/float_dsp_mips.c > > index 8f31b9171b..9996e2bf77 100644 > > --- a/libavutil/mips/float_dsp_mips.c > > +++ b/libavutil/mips/float_dsp_mips.c > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavutil/mips/libm_mips.h b/libavutil/mips/libm_mips.h > > index fbf7cf41cc..9b7694f596 100644 > > --- a/libavutil/mips/libm_mips.h > > +++ b/libavutil/mips/libm_mips.h > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavutil/softfloat_tables.h b/libavutil/softfloat_tables.h > > index 461f2b221d..4665acbbb7 100644 > > --- a/libavutil/softfloat_tables.h > > +++ b/libavutil/softfloat_tables.h > > @@ -2,9 +2,8 @@ > > * Copyright (c) 2012 > > * MIPS Technologies, Inc., California. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, this list of conditions and the following disclaimer. > > * 2. Redistributions in binary form must reproduce the above copyright > > diff --git a/libavutil/uuid.c b/libavutil/uuid.c > > index 062e28736b..bebd4dcb1a 100644 > > --- a/libavutil/uuid.c > > +++ b/libavutil/uuid.c > > @@ -22,9 +22,8 @@ > > /* > > * Copyright (C) 1996, 1997 Theodore Ts'o. > > * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > + * Redistribution and use in source and binary forms, with or without modification, > > + * are permitted provided that the following conditions are met: > > * 1. Redistributions of source code must retain the above copyright > > * notice, and the entire permission notice in its entirety, > > * including the disclaimer of warranties. > > diff --git a/tests/ref/fate/source b/tests/ref/fate/source > > index 723e2e06c7..a3beb35093 100644 > > --- a/tests/ref/fate/source > > +++ b/tests/ref/fate/source > > @@ -1,15 +1,10 @@ > > Files without standard license headers: > > libavcodec/file_open.c > > -libavcodec/ilbcdata.h > > -libavcodec/ilbcdec.c > > libavcodec/interplayacm.c > > libavcodec/log2_tab.c > > libavcodec/reverse.c > > -libavcodec/riscv/startcode_rvb.S > > -libavcodec/riscv/startcode_rvv.S > > libavdevice/file_open.c > > libavdevice/reverse.c > > -libavfilter/af_arnndn.c > > libavfilter/file_open.c > > libavfilter/log2_tab.c > > libavformat/bitstream.c > > Ping for this and the alternative (which changes the check and has > already been LGTM'ed by courmisch; see > https://ffmpeg.org/pipermail/ffmpeg-devel/2024-May/327948.html). Will > apply the solution with more LGTMs in two days unless there are > objections (or unless it is a tie). FWIW I like the idea of modifying a single file (source-check.sh) containing mostly ad hoc rules over modifying a large number of files. > > - Andreas > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/doc/mips.txt b/doc/mips.txt index d66ce3b447..65ae48cf1d 100644 --- a/doc/mips.txt +++ b/doc/mips.txt @@ -15,9 +15,8 @@ Example of copyright notice: * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c index 06d07e1941..422bb21c20 100644 --- a/libavcodec/aacsbr_fixed.c +++ b/libavcodec/aacsbr_fixed.c @@ -2,9 +2,8 @@ * Copyright (c) 2013 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c index c9e5cda69c..59b7492733 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/aom_film_grain_template.c b/libavcodec/aom_film_grain_template.c index 5f9f29f1fa..e510b5c6a7 100644 --- a/libavcodec/aom_film_grain_template.c +++ b/libavcodec/aom_film_grain_template.c @@ -25,8 +25,8 @@ * Copyright © 2018, Two Orioles, LLC * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index 395debe866..a815915909 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -23,9 +23,8 @@ * * This code was partially ported from libvpx, which uses this license: * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. diff --git a/libavcodec/ilbcdata.h b/libavcodec/ilbcdata.h index b17e24df5f..f477ea6a09 100644 --- a/libavcodec/ilbcdata.h +++ b/libavcodec/ilbcdata.h @@ -1,9 +1,8 @@ /* * Copyright (c) 2013, The WebRTC project authors. All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c index 4ecdff4183..9234b82e20 100644 --- a/libavcodec/ilbcdec.c +++ b/libavcodec/ilbcdec.c @@ -1,9 +1,8 @@ /* * Copyright (c) 2013, The WebRTC project authors. All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 8cf82f7216..d6ec6250a9 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -35,9 +35,8 @@ * Copyright (c) 2020, Gautam Ramakrishnan <gautamramk@gmail.com> * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/ac3dsp_mips.c b/libavcodec/mips/ac3dsp_mips.c index cc49ba3888..042af32634 100644 --- a/libavcodec/mips/ac3dsp_mips.c +++ b/libavcodec/mips/ac3dsp_mips.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/acelp_filters_mips.c b/libavcodec/mips/acelp_filters_mips.c index 478db855b2..a5918c4300 100644 --- a/libavcodec/mips/acelp_filters_mips.c +++ b/libavcodec/mips/acelp_filters_mips.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/acelp_vectors_mips.c b/libavcodec/mips/acelp_vectors_mips.c index 0ab2b6a87b..02f6227f6f 100644 --- a/libavcodec/mips/acelp_vectors_mips.c +++ b/libavcodec/mips/acelp_vectors_mips.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/amrwbdec_mips.c b/libavcodec/mips/amrwbdec_mips.c index 5dc054361b..264d75f8aa 100644 --- a/libavcodec/mips/amrwbdec_mips.c +++ b/libavcodec/mips/amrwbdec_mips.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/amrwbdec_mips.h b/libavcodec/mips/amrwbdec_mips.h index a9f66fef94..a1af035675 100644 --- a/libavcodec/mips/amrwbdec_mips.h +++ b/libavcodec/mips/amrwbdec_mips.h @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/celp_filters_mips.c b/libavcodec/mips/celp_filters_mips.c index 926f1cb334..990e8cf1e5 100644 --- a/libavcodec/mips/celp_filters_mips.c +++ b/libavcodec/mips/celp_filters_mips.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/celp_math_mips.c b/libavcodec/mips/celp_math_mips.c index ce711bd63c..9a9958f12c 100644 --- a/libavcodec/mips/celp_math_mips.c +++ b/libavcodec/mips/celp_math_mips.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/compute_antialias_fixed.h b/libavcodec/mips/compute_antialias_fixed.h index 982002ad4c..027021f91e 100644 --- a/libavcodec/mips/compute_antialias_fixed.h +++ b/libavcodec/mips/compute_antialias_fixed.h @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/compute_antialias_float.h b/libavcodec/mips/compute_antialias_float.h index 633eb9589d..70b9677bff 100644 --- a/libavcodec/mips/compute_antialias_float.h +++ b/libavcodec/mips/compute_antialias_float.h @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/fmtconvert_mips.c b/libavcodec/mips/fmtconvert_mips.c index c39e853575..20303f8fd6 100644 --- a/libavcodec/mips/fmtconvert_mips.c +++ b/libavcodec/mips/fmtconvert_mips.c @@ -4,9 +4,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/iirfilter_mips.c b/libavcodec/mips/iirfilter_mips.c index 3a1352a7e4..06fc655665 100644 --- a/libavcodec/mips/iirfilter_mips.c +++ b/libavcodec/mips/iirfilter_mips.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/lsp_mips.h b/libavcodec/mips/lsp_mips.h index 2d67403888..2cd31cb186 100644 --- a/libavcodec/mips/lsp_mips.h +++ b/libavcodec/mips/lsp_mips.h @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/mpegaudiodsp_mips_fixed.c b/libavcodec/mips/mpegaudiodsp_mips_fixed.c index ef9750a44e..1207f11bfa 100644 --- a/libavcodec/mips/mpegaudiodsp_mips_fixed.c +++ b/libavcodec/mips/mpegaudiodsp_mips_fixed.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/mips/mpegaudiodsp_mips_float.c b/libavcodec/mips/mpegaudiodsp_mips_float.c index 53b77619c9..31937166fb 100644 --- a/libavcodec/mips/mpegaudiodsp_mips_float.c +++ b/libavcodec/mips/mpegaudiodsp_mips_float.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavcodec/riscv/startcode_rvb.S b/libavcodec/riscv/startcode_rvb.S index c043d59809..821a0bbc4e 100644 --- a/libavcodec/riscv/startcode_rvb.S +++ b/libavcodec/riscv/startcode_rvb.S @@ -1,8 +1,8 @@ /* * Copyright © 2024 Rémi Denis-Courmont. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. diff --git a/libavcodec/riscv/startcode_rvv.S b/libavcodec/riscv/startcode_rvv.S index 7c43b1d7f3..16abb26955 100644 --- a/libavcodec/riscv/startcode_rvv.S +++ b/libavcodec/riscv/startcode_rvv.S @@ -1,8 +1,8 @@ /* * Copyright © 2024 Rémi Denis-Courmont. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. diff --git a/libavcodec/speexdata.h b/libavcodec/speexdata.h index 476a8c11c6..a7875ae62e 100644 --- a/libavcodec/speexdata.h +++ b/libavcodec/speexdata.h @@ -7,9 +7,8 @@ * Copyright 2003 EpicGames * Copyright 1992-1994 Jutta Degener, Carsten Bormann - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index d25823ef6e..f5ec268f9a 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -7,9 +7,8 @@ * Copyright 2003 EpicGames * Copyright 1992-1994 Jutta Degener, Carsten Bormann - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. diff --git a/libavcodec/vvc/itx_1d.c b/libavcodec/vvc/itx_1d.c index c84e39440a..94e1892c1b 100644 --- a/libavcodec/vvc/itx_1d.c +++ b/libavcodec/vvc/itx_1d.c @@ -28,8 +28,8 @@ * Copyright (c) 2010-2021, ITU/ISO/IEC * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c index b29af87df9..f57e5c3da2 100644 --- a/libavfilter/af_arnndn.c +++ b/libavfilter/af_arnndn.c @@ -7,9 +7,8 @@ * Copyright (c) Jean-Marc Valin * Copyright (c) 2019 Paul B Mahol * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. diff --git a/libavformat/imf.h b/libavformat/imf.h index ef124bf412..03e4720d6a 100644 --- a/libavformat/imf.h +++ b/libavformat/imf.h @@ -20,8 +20,8 @@ * * Copyright (c) Sandflow Consulting LLC * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c index 137cff2a63..fd72b72dd1 100644 --- a/libavformat/imf_cpl.c +++ b/libavformat/imf_cpl.c @@ -20,8 +20,8 @@ * * Copyright (c) Sandflow Consulting LLC * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 32208f89cc..781ad64625 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -20,8 +20,8 @@ * * Copyright (c) Sandflow Consulting LLC * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c index 92d1052a1d..7e2547afb7 100644 --- a/libavformat/tests/imf.c +++ b/libavformat/tests/imf.c @@ -20,8 +20,8 @@ * * Copyright (c) Sandflow Consulting LLC * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c index 95f0eb2595..290822c914 100644 --- a/libavutil/fixed_dsp.c +++ b/libavutil/fixed_dsp.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavutil/fixed_dsp.h b/libavutil/fixed_dsp.h index 9b566af675..b2a58422b7 100644 --- a/libavutil/fixed_dsp.h +++ b/libavutil/fixed_dsp.h @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavutil/mips/float_dsp_mips.c b/libavutil/mips/float_dsp_mips.c index 8f31b9171b..9996e2bf77 100644 --- a/libavutil/mips/float_dsp_mips.c +++ b/libavutil/mips/float_dsp_mips.c @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavutil/mips/libm_mips.h b/libavutil/mips/libm_mips.h index fbf7cf41cc..9b7694f596 100644 --- a/libavutil/mips/libm_mips.h +++ b/libavutil/mips/libm_mips.h @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavutil/softfloat_tables.h b/libavutil/softfloat_tables.h index 461f2b221d..4665acbbb7 100644 --- a/libavutil/softfloat_tables.h +++ b/libavutil/softfloat_tables.h @@ -2,9 +2,8 @@ * Copyright (c) 2012 * MIPS Technologies, Inc., California. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright diff --git a/libavutil/uuid.c b/libavutil/uuid.c index 062e28736b..bebd4dcb1a 100644 --- a/libavutil/uuid.c +++ b/libavutil/uuid.c @@ -22,9 +22,8 @@ /* * Copyright (C) 1996, 1997 Theodore Ts'o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright * notice, and the entire permission notice in its entirety, * including the disclaimer of warranties. diff --git a/tests/ref/fate/source b/tests/ref/fate/source index 723e2e06c7..a3beb35093 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -1,15 +1,10 @@ Files without standard license headers: libavcodec/file_open.c -libavcodec/ilbcdata.h -libavcodec/ilbcdec.c libavcodec/interplayacm.c libavcodec/log2_tab.c libavcodec/reverse.c -libavcodec/riscv/startcode_rvb.S -libavcodec/riscv/startcode_rvv.S libavdevice/file_open.c libavdevice/reverse.c -libavfilter/af_arnndn.c libavfilter/file_open.c libavfilter/log2_tab.c libavformat/bitstream.c
This is against the 80 char line length limit, but it is not a hard rule anyway. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- This is an alternative to modifying check-source.sh (for which I also sent a patch). doc/mips.txt | 5 ++--- libavcodec/aacsbr_fixed.c | 5 ++--- libavcodec/ac3dec_fixed.c | 5 ++--- libavcodec/aom_film_grain_template.c | 4 ++-- libavcodec/arm/vp8dsp_armv6.S | 5 ++--- libavcodec/ilbcdata.h | 5 ++--- libavcodec/ilbcdec.c | 5 ++--- libavcodec/j2kenc.c | 5 ++--- libavcodec/mips/ac3dsp_mips.c | 5 ++--- libavcodec/mips/acelp_filters_mips.c | 5 ++--- libavcodec/mips/acelp_vectors_mips.c | 5 ++--- libavcodec/mips/amrwbdec_mips.c | 5 ++--- libavcodec/mips/amrwbdec_mips.h | 5 ++--- libavcodec/mips/celp_filters_mips.c | 5 ++--- libavcodec/mips/celp_math_mips.c | 5 ++--- libavcodec/mips/compute_antialias_fixed.h | 5 ++--- libavcodec/mips/compute_antialias_float.h | 5 ++--- libavcodec/mips/fmtconvert_mips.c | 5 ++--- libavcodec/mips/iirfilter_mips.c | 5 ++--- libavcodec/mips/lsp_mips.h | 5 ++--- libavcodec/mips/mpegaudiodsp_mips_fixed.c | 5 ++--- libavcodec/mips/mpegaudiodsp_mips_float.c | 5 ++--- libavcodec/riscv/startcode_rvb.S | 4 ++-- libavcodec/riscv/startcode_rvv.S | 4 ++-- libavcodec/speexdata.h | 5 ++--- libavcodec/speexdec.c | 5 ++--- libavcodec/vvc/itx_1d.c | 4 ++-- libavfilter/af_arnndn.c | 5 ++--- libavformat/imf.h | 4 ++-- libavformat/imf_cpl.c | 4 ++-- libavformat/imfdec.c | 4 ++-- libavformat/tests/imf.c | 4 ++-- libavutil/fixed_dsp.c | 5 ++--- libavutil/fixed_dsp.h | 5 ++--- libavutil/mips/float_dsp_mips.c | 5 ++--- libavutil/mips/libm_mips.h | 5 ++--- libavutil/softfloat_tables.h | 5 ++--- libavutil/uuid.c | 5 ++--- tests/ref/fate/source | 5 ----- 39 files changed, 76 insertions(+), 111 deletions(-)