On Tue, Aug 26, 2014 at 12:32:32PM +0200, Andreas Cadhalpun wrote: > On 26.08.2014 01:42, Michael Niedermayer wrote: > >From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > > > >--- > > LICENSE.md | 1 + > > tests/Makefile | 2 +- > > tests/flower.pnm | Bin 0 -> 196623 bytes > > tests/lena.pnm | 109 > > ---------------------------- > [...] > > 128 files changed, 1161 insertions(+), 1268 deletions(-) > > create mode 100644 tests/flower.pnm > > delete mode 100644 tests/lena.pnm > > > >diff --git a/LICENSE.md b/LICENSE.md > >index e78d932..ccd494f 100644 > >--- a/LICENSE.md > >+++ b/LICENSE.md > >@@ -64,6 +64,7 @@ There are a handful of files under other licensing terms, > >namely: > > You must also indicate any changes including additions and deletions to > > those three files in the documentation. > > > >+tests/flower.pnm is under public domain > > It is disputed whether or not the laws in Germany/Austria allow > placing work in the public domain [1]. > To avoid any doubt, it would be better to change this to something like: > > tests/flower.pnm copyrighted by Michael Niedermayer is placed in the > public domain by licensing it under CCO, see: > https://creativecommons.org/publicdomain/zero/1.0/legalcode
yes, you can use flower.pnm under CC0 too [..] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have often repented speaking, but never of holding my tongue. -- Xenocrates
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
