From patchwork Mon Dec 26 17:14:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 1930 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1120517vsb; Mon, 26 Dec 2016 09:14:48 -0800 (PST) X-Received: by 10.28.145.210 with SMTP id t201mr15822790wmd.37.1482772488785; Mon, 26 Dec 2016 09:14:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 5si46684006wjz.60.2016.12.26.09.14.48; Mon, 26 Dec 2016 09:14:48 -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; 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 40255689C12; Mon, 26 Dec 2016 19:14:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81763689B29 for ; Mon, 26 Dec 2016 19:14:37 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 5F808100BD2; Mon, 26 Dec 2016 18:14:39 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0BM-nCNe1vKR; Mon, 26 Dec 2016 18:14:38 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 0196FFFC60; Mon, 26 Dec 2016 18:14:37 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Dec 2016 18:14:32 +0100 Message-Id: <20161226171434.935-1-cus@passwd.hu> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/channel_layout: fix remains of old syntax in docs and comments 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- doc/utils.texi | 14 +++++++------- libavutil/channel_layout.h | 7 +------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/doc/utils.texi b/doc/utils.texi index 7aea460..df887c7 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -719,19 +719,19 @@ the name of a standard channel layout (e.g. @samp{mono}, the name of a single channel (e.g. @samp{FL}, @samp{FR}, @samp{FC}, @samp{LFE}, etc.) @item -a number of channels, in decimal, optionally followed by 'c', yielding -the default channel layout for that number of channels (see the -function @code{av_get_default_channel_layout}) +a number of channels, in decimal, followed by 'c', yielding the default channel +layout for that number of channels (see the function +@code{av_get_default_channel_layout}). Note that not all channel counts have a +default layout. @item a channel layout mask, in hexadecimal starting with "0x" (see the @code{AV_CH_*} macros in @file{libavutil/channel_layout.h}. @end itemize -Starting from libavutil version 53 the trailing character "c" to -specify a number of channels will be required, while a channel layout -mask could also be specified as a decimal number (if and only if not -followed by "c"). +Before libavutil version 53 the trailing character "c" to specify a number of +channels was optional, but now it is required, while a channel layout mask can +also be specified as a decimal number (if and only if not followed by "c"). See also the function @code{av_get_channel_layout} defined in @file{libavutil/channel_layout.h}. diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index ec7effe..38c3337 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -131,17 +131,12 @@ enum AVMatrixEncoding { * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix); * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC, * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR); - * - a number of channels, in decimal, optionally followed by 'c', yielding + * - a number of channels, in decimal, followed by 'c', yielding * the default channel layout for that number of channels (@see * av_get_default_channel_layout); * - a channel layout mask, in hexadecimal starting with "0x" (see the * AV_CH_* macros). * - * @warning Starting from the next major bump the trailing character - * 'c' to specify a number of channels will be required, while a - * channel layout mask could also be specified as a decimal number - * (if and only if not followed by "c"). - * * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7" */ uint64_t av_get_channel_layout(const char *name);