From patchwork Tue Oct 4 22:10:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 877 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2396026vsd; Tue, 4 Oct 2016 15:10:14 -0700 (PDT) X-Received: by 10.194.178.65 with SMTP id cw1mr4867117wjc.215.1475619014462; Tue, 04 Oct 2016 15:10:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ih4si7247456wjb.124.2016.10.04.15.10.13; Tue, 04 Oct 2016 15:10:14 -0700 (PDT) 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=@itanimul.li; dkim=neutral (body hash did not verify) header.i=@messagingengine.com; 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 A2F44689D7E; Wed, 5 Oct 2016 01:09:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2342689A7C for ; Wed, 5 Oct 2016 01:09:50 +0300 (EEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 9FB0020F4A for ; Tue, 4 Oct 2016 18:10:04 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute7.internal (MEProxy); Tue, 04 Oct 2016 18:10:04 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=itanimul.li; h= date:from:message-id:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=38Qa1z1XAHZU9U1hwN5hMjGDK94=; b=Zy7h3+nRkxllGlYyqVcW+5zUBjbZ B5UimZp3gTPWtT6tA/uOSMlLNmzyUK5uEjD8L7dJpI2I4RSAGwGwXTOqr4paDiI5 hNb+B5EeeW5Kim0YC4OK1s4HY+ChbP1GhkwWJJu0CfbZmwonS+zalYGPafwSEjiA mFg11MLhO6uJvug= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-sasl-enc:x-sasl-enc; s=smtpout; bh=38Qa1z1XAHZU9U1hwN5hMjGDK9 4=; b=ohYWb1709XTbGkvSZQ62PILFuvxMPnB+k5NvSfdP/FDvRVs2K9Zeh+I+un X64pLQPvIC+rYa/srUfAHkC5PpNvU3DeYYx8YpPYEs0ztjAA1MfsUSXjKryNnNIB tnyxMBYxoYCTbmkR/YibbaBoB+Lmn/dhUXz06Mr2kF8x3vaso= X-Sasl-enc: nAChC/MaCQU3A45cMYzFgKezD3ISpAWfl65+wM/TF14Y 1475619004 Received: from localhost (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 23314F29CF for ; Tue, 4 Oct 2016 18:10:04 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2016 23:10:00 +0100 Message-Id: <20161004221000.46147-1-josh@itanimul.li> X-Mailer: git-send-email 2.8.4 (Apple Git-73) Subject: [FFmpeg-devel] [PATCH] doc/developer: remove duplicate policies and fix error 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes regression as of ee72b6d1 Signed-off-by: Josh de Kock --- The irony of this patch is terrible, but oh well. Maybe we're missing a 'everyone makes mistakes' policy. doc/developer.texi | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/doc/developer.texi b/doc/developer.texi index 3fcfe86..cf809b9 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -293,12 +293,7 @@ later on. Also if you have doubts about splitting or not splitting, do not hesitate to ask/discuss it on the developer mailing list. -@item API/ABI changes should be discussed before they are made. -Do not change behavior of the programs (renaming options etc) or public -API or ABI without first discussing it on the ffmpeg-devel mailing list. -Do not remove widely used functionality or features (redundant code can be removed). - -@item Ask before you change the build system (configure, etc). +@subheading Ask before you change the build system (configure, etc). Do not commit changes to the build system (Makefiles, configure script) which change behavior, defaults etc, without asking first. The same applies to compiler warning fixes, trivial looking fixes and to code @@ -307,7 +302,7 @@ the way we do. Send your changes as patches to the ffmpeg-devel mailing list, and if the code maintainers say OK, you may commit. This does not apply to files you wrote and/or maintain. -@item Cosmetic changes should be kept in separate patches. +@subheading Cosmetic changes should be kept in separate patches. We refuse source indentation and other cosmetic changes if they are mixed with functional changes, such commits will be rejected and removed. Every developer has his own indentation style, you should not change it. Of course @@ -356,15 +351,6 @@ Do not change behavior of the programs (renaming options etc) or public API or ABI without first discussing it on the ffmpeg-devel mailing list. Do not remove widely used functionality or features (redundant code can be removed). -@subheading Ask before you change the build system (configure, etc). -Do not commit changes to the build system (Makefiles, configure script) -which change behavior, defaults etc, without asking first. The same -applies to compiler warning fixes, trivial looking fixes and to code -maintained by other developers. We usually have a reason for doing things -the way we do. Send your changes as patches to the ffmpeg-devel mailing -list, and if the code maintainers say OK, you may commit. This does not -apply to files you wrote and/or maintain. - @subheading Remember to check if you need to bump versions for libav*. Depending on the change, you may need to change the version integer. Incrementing the first component means no backward compatibility to