From patchwork Tue Mar 14 20:15:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katherine Frances Nagels X-Patchwork-Id: 2927 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1759016vsy; Tue, 14 Mar 2017 13:15:43 -0700 (PDT) X-Received: by 10.223.170.200 with SMTP id i8mr39288612wrc.79.1489522543796; Tue, 14 Mar 2017 13:15:43 -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 h82si16585290wmh.163.2017.03.14.13.15.42; Tue, 14 Mar 2017 13:15:43 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 552E0680CC1; Tue, 14 Mar 2017 22:15:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua0-f172.google.com (mail-ua0-f172.google.com [209.85.217.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ACC3680AE4 for ; Tue, 14 Mar 2017 22:15:17 +0200 (EET) Received: by mail-ua0-f172.google.com with SMTP id 72so176375092uaf.3 for ; Tue, 14 Mar 2017 13:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=07u4j/ItkqOBx1T5iqV2yPDRKA5HF0EtWAebJxO9K1A=; b=n5n10ofn7mHO/DklL5cD1wmsZ4P4bhMoQav1z5OYyGJDONwr+tNAxzJ3v1JMAfepY9 tMsDZZD2u6VEwbegjSvecZEwwQ/JHQ+57ZqknPSYtwIzfuMpCx3zexY6OJGjQyn+fxYB q0c/ZQ1iBiyA1V0qaJNiYNN1TIxYp1QOBiWDAB3J5Ea0cDLcXVecgPLKi0HMX1Fuiu1A wgBCQTVz8kNnKfv/o62ZeO0EUTDLgLoc1XATDZY6pOps39SmzJZh18NKHLELXQO1Nz96 OUBlLblti3KFHR3lG0Dng11lbZDzcjjD4Ui44owdJsTAU4G26lGUNsWPAWkdWRx4souH aO2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to; bh=07u4j/ItkqOBx1T5iqV2yPDRKA5HF0EtWAebJxO9K1A=; b=ZLUrc0l3Hm/CVgXL5flgOpGySrEiefAf5Yskt1CgUXlXFRT/H2rGh9zEmYMgoAj9fP ez9RJUz3uTXqVa2Lp5S8lcOYxPUxmEluKML/KbQVZR9tFOGnB88OpaXPuIHEyzEyYmT8 u1O7uZ2f0PGQiHJksOl0hvumuviwFv0AJg8sl5tyWfCsKpkp5k3mB0hT9g89iI0LkezH L4Smq5L5krnczEwDEPBEGwf7tSY2dXmztj5thQHGrlkQcxODfVdCf3nQ2uUxJ/7LUWvX p2raqRxU92zS9f02NEMHmuCfhhKSh9mQ6k1R776JzJPIZ7VUCUQ6aPjSe7ZELIFmoQED PlsA== X-Gm-Message-State: AMke39l6P4sJjfhz2hR30qCb54wnb2SyvaFbpv6k/jC/8G67FlheKojZW3kKqwLwU2J/jPdWz2ab/LFD0zF82A== X-Received: by 10.176.65.41 with SMTP id j38mr16142052uad.88.1489522531770; Tue, 14 Mar 2017 13:15:31 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.174.216 with HTTP; Tue, 14 Mar 2017 13:15:31 -0700 (PDT) In-Reply-To: <20170314200045.GX5776@nb4> References: <20170312202954.GL5776@nb4> <20170314200045.GX5776@nb4> From: Katherine Frances Nagels Date: Wed, 15 Mar 2017 09:15:31 +1300 X-Google-Sender-Auth: U4iF3rg1uAJ9iRyqddnxCVS8F0A Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] Documentation: -vf colormatrix options 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Wed, Mar 15, 2017 at 9:00 AM, Michael Niedermayer wrote: > > Thats not a name, i assume you want the authors (your?) name in there > it cannot be changed after pushing so please correct this unless > you want it to be kfrn > Now changed - see attached. Thank you Michael, and apologies that I made this commit a bit messy. From 0dba536e2f98597d9928541517583363bbf9ad00 Mon Sep 17 00:00:00 2001 From: Katherine Nagels Date: Mon, 13 Mar 2017 11:57:11 +1300 Subject: [PATCH] doc/filters: Add colourspace values for colormatrix filter --- doc/filters.texi | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 192a81a..950ff81 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5260,15 +5260,24 @@ The accepted values are: @item bt709 BT.709 +@item fcc +FCC + @item bt601 BT.601 +@item bt470 +BT.470 + +@item bt470bg +BT.470BG + +@item smpte170m +SMPTE-170M + @item smpte240m SMPTE-240M -@item fcc -FCC - @item bt2020 BT.2020 @end table -- 2.7.4