From patchwork Tue Nov 14 22:35:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6108 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5073822jah; Wed, 15 Nov 2017 13:36:39 -0800 (PST) X-Google-Smtp-Source: AGs4zMZYKo+aQ/XqxepJFgqSv2UyOkV/r6hf4Q4h0JSrqylsJC1GXxdohJifFhV0SXhyeXCnDUsN X-Received: by 10.28.54.3 with SMTP id d3mr13091763wma.79.1510781798931; Wed, 15 Nov 2017 13:36:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510781798; cv=none; d=google.com; s=arc-20160816; b=0Se6DxVj2G1o1NOiKjclmuVmwfXW02XKogX3JeZyDJNlm48MkladLl6YRn8jHB4bJ+ jJqFlHSx86IShbVAuhD8P+8EeNa/9r42+iAMmcoZBVs0FAJ8Y5js9YTrCqLN6iaYW8u1 /dB4PXCvXBfsvKLwrRrLudV4vt5DexuJLFn46IhXG8I32YwcpS+5Yv5Q4lmLcnY67Ncw MNXDy0TIK8Kqw9xH5Rs/cEaH6dvukrkkNSdq8KIkwpvhIWB4DDf+TNFrDKn6KXMtbSVU xVWmXZYqmh37xUCgO2+ol9zcJG5pYLQ5cxFo0RQ4fO1p1wIUjTdl2SQg5Sk4GNWgzixv jvCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=cb2JG1j2jCVVmuVAlbEFaJa1+AYxziI+zUadaZlAUxA=; b=jmjLr+sUKB5O9JC6zfGI7DguxkDwFzkFIx0BLcIB3eJgYL97ig0VpRo3UoyT+mnPWD MnEaR/6flSydCz/bOqKHRsK1GN2Cve3AygtP+geUda/gnW2shWu4cev3GOR8eiD/3UCW sJcCjI9wQ9GqoKQi6YEDRJOa0L4jXbBvmJhVBdXNkuVgtRaWAR05CtzyASDq/kaymcBb cWfKTL/lndv4Zg/tMc0z4PZQx2YK29bPrAuhuRsGSHFIde05wbUXbBf96H1Gx758Bufh QJ70/uMd/hGU649fYjzLYrJIuu0AEmJ/fAi05c1VyuPZ831zDao4h6MRagzgH4V6BlZR gUFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=wqr3hZst; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k44si16821315wre.250.2017.11.15.13.36.38; Wed, 15 Nov 2017 13:36:38 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=wqr3hZst; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0ECC4689C12; Wed, 15 Nov 2017 23:36:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com [209.85.192.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83AEB689F95 for ; Wed, 15 Nov 2017 00:35:45 +0200 (EET) Received: by mail-pf0-f175.google.com with SMTP id x7so15501249pfa.1 for ; Tue, 14 Nov 2017 14:36:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=caTxaiJucVGOatPbzeiNZcs7uIYu5f3NpWFFOVFCK34=; b=wqr3hZstQcvYF4QrvuqqkbK7Dmvi2mk0CoTdR5P3+K/cxWqtfy+/o01bPf0BlduTNc cUmVnIlDiqWGabI3ovb+WPY66qXYS2FPAcIPQtf0rMR4sca+quiVccwCh8rbZxc8HO83 5L3ryrTo9TOvnQrelLweGVl5RUpOOq/LPUBG1Q4Rf6trP99hiaCHhgJJr8lmYZ89olnF Mw8N+VUL+DdlTj4E9zSbuDSB+BPMFPuQzzF4rwllQ9lAs/5xoHTekdOqKto5klEqRRco 8AgHZ9gf8WxtROVe8KU/kjN+2FJOaVWTuJJdV7X7oyqJvtXb39MzJTN303KZ1spEA7E3 cfew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=caTxaiJucVGOatPbzeiNZcs7uIYu5f3NpWFFOVFCK34=; b=Of+Nyr+GJZuQ2aeKG/Ia4sXTSJUa//4Xn1cyTXIJgl/sfMtEruE/swcN4GApjQqA8K 6TAQDxmLfxG8dIthdevzbuqiV+kbBnzWP/0+tEU3OZthtfxDv2x4g+CNE3sWpO6gwNeH qhoXJLzRLlCm9vAG9B7Pza8qGDbDvKvwCSWYSt2grcm/LCz1zEvnG23eA6aR06dJwHRx 2g3S+CBusdcqojcrZt3ZN79O5IPypxzxhwvFcEqA4H7+7NAh9xP6v+w5imC1su64DYk5 rTzo1WndtI27k0dFiiYZom172eZQhNFiXJav7uiiqodg21MF+1uKXssZZEwYeNqAqdPw coJg== X-Gm-Message-State: AJaThX5XGyMEictBJRd3EL1OyYRF94JFnKjJsZT80n79HkMm+ikqe7nK vgitEO+9f6gJM2qrJFmcsWsP4QQJ X-Received: by 10.99.107.7 with SMTP id g7mr11274294pgc.387.1510698958802; Tue, 14 Nov 2017 14:35:58 -0800 (PST) Received: from tmm1-imac.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id o123sm30249044pfb.102.2017.11.14.14.35.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Nov 2017 14:35:58 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Nov 2017 14:35:39 -0800 Message-Id: <20171114223539.72605-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 15 Nov 2017 23:36:21 +0200 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_cropdetect: change license to LGPL X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: vittorio.giovara@gmail.com, michaelni@gmx.at, cehoyos@ag.or.at, gajjanagadde@gmail.com, Aman Gupta , ubitux@gmail.com, anton@khirnov.net, mfcc64@gmail.com, stefano.sabatini-lala@poste.it, onemda@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta This filter was imported from mplayer's libmpcodecs/vf_cropdetect.c, and marked as GPL when originally copied over. On the mplayer side, it was authored originally by arpi and subsequently touched by the following contributors. See https://github.com/pigoz/mplayer-svn/commits/master/libmpcodecs/vf_cropdetect.c arpi albeu diego reimar michael reynaldo lucabe cehoyos Of these contributors, all except the last two granted their permission to relicense mplayer changes to LGPL. See https://github.com/mpv-player/mpv/wiki/List-of-MPlayer-LGPL-relicensing-agreements The change by lucabe was to remove an include header, and the change by cehoyos was to change whitespace. Both are trivial and can be ignored for copyright purposes. See https://github.com/pigoz/mplayer-svn/commit/6da0237a4#diff-2d400db883ad8bca0e5d6a78f12613fd and https://github.com/pigoz/mplayer-svn/commit/04d069fcb#diff-2d400db883ad8bca0e5d6a78f12613fd The import into ffmpeg was done by Stefano Sabatini. It was then touched by the following contributors, who specifically made changes to the filter. This does not include commits which changed this file but were part of larger refactorings that changed lavfi APIs and other LGPL filters as well. See https://github.com/FFmpeg/FFmpeg/commits/master/libavfilter/vf_cropdetect.c Stefano Sabatini Michael Niedermayer Anton Khirnov Clément Bœsch Paul B Mahol Carl Eugen Hoyos Vittorio Giovara Ganesh Ajjanagadde The people above are CC'd on this patch for their permission to relicense vf_cropdetect as LGPL. --- configure | 1 - libavfilter/vf_cropdetect.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 3788f26956..c1bdea9fa5 100755 --- a/configure +++ b/configure @@ -3185,7 +3185,6 @@ coreimage_filter_extralibs="-framework OpenGL" coreimagesrc_filter_deps="coreimage appkit" coreimagesrc_filter_extralibs="-framework OpenGL" cover_rect_filter_deps="avcodec avformat gpl" -cropdetect_filter_deps="gpl" deinterlace_qsv_filter_deps="libmfx" deinterlace_vaapi_filter_deps="vaapi" delogo_filter_deps="gpl" diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index 7c7d0b953a..84abbe714c 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -2,19 +2,19 @@ * Copyright (c) 2002 A'rpi * This file is part of FFmpeg. * - * FFmpeg is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with FFmpeg; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /**