From patchwork Fri Oct 21 08:32:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Behrisch X-Patchwork-Id: 1095 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp974517vsd; Fri, 21 Oct 2016 01:33:11 -0700 (PDT) X-Received: by 10.28.153.66 with SMTP id b63mr9132123wme.79.1477038791440; Fri, 21 Oct 2016 01:33:11 -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 yt4si1533176wjc.34.2016.10.21.01.33.10; Fri, 21 Oct 2016 01:33:11 -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; 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 AF9A0689C3E; Fri, 21 Oct 2016 11:33:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from lupus.uberspace.de (lupus.uberspace.de [95.143.172.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32B2E689B42 for ; Fri, 21 Oct 2016 11:32:59 +0300 (EEST) Received: (qmail 28020 invoked from network); 21 Oct 2016 08:33:01 -0000 Received: from localhost (HELO ?IPv6:2a02:8109:8840:26f4:ba88:e3ff:fefb:63b7?) (127.0.0.1) by behrisch.lupus.uberspace.de with SMTP; 21 Oct 2016 08:33:01 -0000 To: ffmpeg-devel@ffmpeg.org References: <8701e6bd-82fb-5f96-e87a-f58ae2776895@behrisch.de> <20161018111137.GA8208@sunshine.barsnick.net> <71c978a2-a11b-d95b-0588-7eb239a571ce@behrisch.de> <20161020074940.GA2493607@phare.normalesup.org> <20161020075410.GA8015@kimiko.pkh.me> <20161020075517.GA2500274@phare.normalesup.org> <20161020080013.GB8015@kimiko.pkh.me> From: Michael Behrisch Message-ID: <5c9b89aa-e659-0eaf-ee40-2bdc86a08def@behrisch.de> Date: Fri, 21 Oct 2016 10:32:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20161020080013.GB8015@kimiko.pkh.me> X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] removing comma at final enumeration items to fix pedantic warnings 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" Am 20.10.2016 um 10:00 schrieb Clément Bœsch: > On Thu, Oct 20, 2016 at 09:55:17AM +0200, Nicolas George wrote: >> Le nonidi 29 vendémiaire, an CCXXV, Clement Boesch a écrit : >>> it's really a trivial and harmless patch. >> >> Which is not enough to accept it. >> > > but the patch is perfectly fine and semantically more correct (it > explicits that it's wrong to add entry afterward). > >> I am sure there are better uses of contributors' time than that. >> > > people are free to do whatever they feel like; you're just wasting yours > by bikeshedding about this stuff you could just ignore. > So here is the patch again, this time without the line breaks, hopefully. Best regards, Michael --- libavutil/log.h | 2 +- libavutil/pixfmt.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavutil/log.h b/libavutil/log.h index 0acc1b9..f0a5738 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -44,7 +44,7 @@ typedef enum { AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, AV_CLASS_CATEGORY_DEVICE_OUTPUT, AV_CLASS_CATEGORY_DEVICE_INPUT, - AV_CLASS_CATEGORY_NB, ///< not part of ABI/API + AV_CLASS_CATEGORY_NB ///< not part of ABI/API }AVClassCategory; #define AV_IS_INPUT_DEVICE(category) \ diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index b15c0ef..7a3f68b 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -306,7 +306,7 @@ enum AVPixelFormat { AV_PIX_FMT_MEDIACODEC, ///< hardware decoding through MediaCodec - AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions + AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; #if AV_HAVE_BIGENDIAN @@ -401,7 +401,7 @@ enum AVColorPrimaries { AVCOL_PRI_SMPTEST428_1 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 D65 (2010) - AVCOL_PRI_NB, ///< Not part of ABI + AVCOL_PRI_NB ///< Not part of ABI }; /** @@ -427,7 +427,7 @@ enum AVColorTransferCharacteristic { AVCOL_TRC_SMPTEST2084 = 16, ///< SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems AVCOL_TRC_SMPTEST428_1 = 17, ///< SMPTE ST 428-1 AVCOL_TRC_ARIB_STD_B67 = 18, ///< ARIB STD-B67, known as "Hybrid log-gamma" - AVCOL_TRC_NB, ///< Not part of ABI + AVCOL_TRC_NB ///< Not part of ABI }; /** @@ -446,7 +446,7 @@ enum AVColorSpace { AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system AVCOL_SPC_SMPTE2085 = 11, ///< SMPTE 2085, Y'D'zD'x - AVCOL_SPC_NB, ///< Not part of ABI + AVCOL_SPC_NB ///< Not part of ABI }; #define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG @@ -458,7 +458,7 @@ enum AVColorRange { AVCOL_RANGE_UNSPECIFIED = 0, AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges - AVCOL_RANGE_NB, ///< Not part of ABI + AVCOL_RANGE_NB ///< Not part of ABI }; /** @@ -484,7 +484,7 @@ enum AVChromaLocation { AVCHROMA_LOC_TOP = 4, AVCHROMA_LOC_BOTTOMLEFT = 5, AVCHROMA_LOC_BOTTOM = 6, - AVCHROMA_LOC_NB, ///< Not part of ABI + AVCHROMA_LOC_NB ///< Not part of ABI }; #endif /* AVUTIL_PIXFMT_H */