On Thu, Oct 7, 2021 at 1:24 PM Pierre-Anthony Lemieux <p...@sandflow.com> wrote: > > On Thu, Oct 7, 2021 at 1:03 PM Lynne <d...@lynne.ee> wrote: > > > > 6 Oct 2021, 02:45 by p...@sandflow.com: > > > > > On Tue, Oct 5, 2021 at 5:03 PM Lynne <d...@lynne.ee> wrote: > > > > > >> > > >> 5 Oct 2021, 17:22 by p...@sandflow.com: > > >> > > >> > Hi Lynne, > > >> > > > >> > Can you be more specific? > > >> > > > >> > The file header we used look consistent with the header of other > > >> > BSD-licensed files, like aacdec.c. > > >> > > > >> > Thanks, > > >> > > > >> > -- Pierre > > >> > > > >> > On Thu, Sep 30, 2021 at 6:40 AM Lynne <d...@lynne.ee> wrote: > > >> > > > >> >> > > >> >> 29 Sept 2021, 22:47 by p...@sandflow.com: > > >> >> > > >> >> > From: Pierre-Anthony Lemieux <p...@sandflow.com> > > >> >> > > > >> >> > Signed-off-by: Pierre-Anthony Lemieux <p...@sandflow.com> > > >> >> > --- > > >> >> > > > >> >> > Notes: > > >> >> > Implements IMF Composition Playlist (CPL) parsing. > > >> >> > > > >> >> > libavformat/imf_cpl.c | 652 > > >> >> > ++++++++++++++++++++++++++++++++++++++++++ > > >> >> > 1 file changed, 652 insertions(+) > > >> >> > create mode 100644 libavformat/imf_cpl.c > > >> >> > > > >> >> > diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c > > >> >> > new file mode 100644 > > >> >> > index 0000000000..e0c8e2c58f > > >> >> > --- /dev/null > > >> >> > +++ b/libavformat/imf_cpl.c > > >> >> > @@ -0,0 +1,652 @@ > > >> >> > +/* > > >> >> > + * This file is part of FFmpeg. > > >> >> > + * > > >> >> > + * 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: > > >> >> > + * > > >> >> > + * * Redistributions of source code must retain the above > > >> >> > copyright notice, this > > >> >> > + * list of conditions and the following disclaimer. > > >> >> > + * * Redistributions in binary form must reproduce the above > > >> >> > copyright notice, > > >> >> > + * this list of conditions and the following disclaimer in the > > >> >> > documentation > > >> >> > + * and/or other materials provided with the distribution. > > >> >> > + * > > >> >> > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > > >> >> > CONTRIBUTORS "AS IS" > > >> >> > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > >> >> > LIMITED TO, THE > > >> >> > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > > >> >> > PARTICULAR PURPOSE > > >> >> > + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR > > >> >> > CONTRIBUTORS BE > > >> >> > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > >> >> > EXEMPLARY, OR > > >> >> > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > >> >> > PROCUREMENT OF > > >> >> > + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > > >> >> > BUSINESS > > >> >> > + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, > > >> >> > WHETHER IN > > >> >> > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR > > >> >> > OTHERWISE) > > >> >> > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF > > >> >> > ADVISED OF THE > > >> >> > + * POSSIBILITY OF SUCH DAMAGE. > > >> >> > + */ > > >> >> > > > >> >> > > >> >> Please use the standard file headers we use. > > >> >> > > >> > > >> Please don't top-post. > > >> libavcodec/aacdec.c's header isn't BSD. It's LGPL, like most of our code. > > >> > > > > > > Oh. I think I meant libavcodec/aadec.c. > > > > > > > File doesn't exist. > > libavformat/aadec.c > > (Third time the charm :) > > > > > > > >> We have a test that runs to check the header of every file in our repo, > > >> > > > > > > Do you mean `make fate-source`? If so, the patch currently passes the > > > test. > > Did you mean `make fate-source`? (For future reference) > > > > > > >> and unfortunately, that test doesn't have a law degree. So, you have to > > >> copy > > >> the header verbatim from other files (which you can BSD is compatible > > >> with LGPL, so if you copy the author's attributions, you can) or add an > > >> exception > > >> > > > > > > The intent is not to add an exception, just offer the code under > > > 2-clause BSD. Ok? > > > > > > > Not ok. If you want to do that, you need to add an exception. But really, > > it'll be much simpler to just put a BSD licensed version somewhere > > else separately, and license the version here under the LGPL, same > > as most of our other code. > > Understood.
See revised header at [1]. [1] https://patchwork.ffmpeg.org/project/ffmpeg/patch/20211007234126.5353-1-...@sandflow.com/ (Not sure why the email does not show up in the mailing list archive) > > > That way, everyone's happy. Not everyone here's happy to have BSD > > code in the repo. I'd have reservations about it. > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > To unsubscribe, visit link above, or email > > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
