From patchwork Sun Sep 25 00:10:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38235 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1391037pzh; Sat, 24 Sep 2022 17:15:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6XTDzR5Kh7Tw0tGBq/6lQ5+IGdYDPqGzz8LDOT13Cdx1zBLV+ol/U1uqpCBEJM+tUTHNKv X-Received: by 2002:a05:6402:44c:b0:445:f2f1:4add with SMTP id p12-20020a056402044c00b00445f2f14addmr15526440edw.257.1664064917751; Sat, 24 Sep 2022 17:15:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664064917; cv=none; d=google.com; s=arc-20160816; b=hh0gZTnFATPZGLdDMtwngh1YpLzfiJljpAFz48hNTExW/WMYsEecSdid8BtdpxVaSg vpJFag+YRZnC+w0XaVsKtlSKOMt9ptOhXXmknYuRPvyTMRbc/PL1ln7vzZvvdpoIfmxU /OjIsdLPgIIVNzxa0WMT6S8n+/7c/dJkS70TEEQaNu9h/cia3wZluQPWlaS0RAr7rlNv rKxC1ZZORSrk3udbgu7jtOZq/32Aougt9PnrlLd5HdYZWS3jFzK67cXYlVA8a2k/3YqL 9UW2eCBYIEPzbV2cNhzbis9QetVCd40Naat6YnDjUYMrfHZxWSgADNb0F76fPKUQyv4E 1Y8A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Et1Wo1zLFfFMph2T1/IZTs75V7FfzHt0v/F2eXWRx5Y=; b=YE06tH+5vVzHI3syxNT9Z1DUnE0iV3vj2j/72B9Snk7UWY6jSnq/CzSA4opzrvUCB5 n+5s1OeMjpSX5M3DwBYctb3G4CvZV/yTyZLSbSZstTMXTTtgtvVWn63C3t9Y9Q2QTAl8 9yGl/Iz3VOYQgnSracWTjPTg6DEtuMF9PotA27PADFxaoYFH2my0eKUkOhkW7U9Bs3nO hgRTk7L2Lh3wsTZQwWEslhK/HTQDoqqTLJ6pBrUcdSx0C1+pEW2WlYI/4ASR4knv0O8t J+kXSVBOvAV6EHR5e8alz1NXbME9JbU7pyKd8+7w0G9Fr40SIGBMQA9eD2fcDuSMTn7D tG7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QtziwlNu; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eo10-20020a056402530a00b004523826ed6dsi10696577edb.554.2022.09.24.17.15.17; Sat, 24 Sep 2022 17:15:17 -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 header.s=20210112 header.b=QtziwlNu; 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=QUARANTINE 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 7A6F668BC08; Sun, 25 Sep 2022 03:12:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14B0E68BBC4 for ; Sun, 25 Sep 2022 03:12:03 +0300 (EEST) Received: by mail-ed1-f50.google.com with SMTP id b35so4739810edf.0 for ; Sat, 24 Sep 2022 17:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=6zb/fprGqE/xn1DjeaDThWY0TfouSQxBDJGEyjwogwE=; b=QtziwlNuH3RoC+nwThrgisjTNYbh5ZcoMiOx4cUFji09CHUMgL2FTRfOqd0XhwnTxK nUacXyUt3fmsRA5edcj+m4DFuI52mmaeRBbcp61aX6r3iPVhHCN4aXCrEeJKyOFkyIJ8 udJAZFnXpls1tutNUtonm+7LkMfqTg/7MJvobvxguFICZPdDR/gt/KVD2Oi3RVJmnJLM G0BggvL60c8IxL0xAulD87tmAj4Ky1Dw88AsSZjDI6OMzkLGZR2KzUbKu7TCxqR8VtrJ E40+uV/G/IlLd3Cajs/xsfUHi0pwaU5XenbEfCQCH8vJ3Hq9Z6rpf3dZn31MYj8l47O3 iwSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=6zb/fprGqE/xn1DjeaDThWY0TfouSQxBDJGEyjwogwE=; b=klA0oh/DH8HwRMiFKoFOCRvGsmI9XWrMqlMDUUovqX0VB1tSbHF3/Gso2gV4Pc66Zw 4Z8zPjQwiBaiw2n5d7qDWanOqR2psiD5kqa21JrG8RQgkFYEd5s5m5qao3d7LId7IYMZ bRH7YfNVAVcMOkDNGWfFwmJKon/NTf1fhTcPrPTZob6gjurfkvZMN+WCcAw43TC1+PoF vhHpEAsW9Yk9/o6XCbhecvQEmkFtzkJiXobFQMkmMCZ6mkPQO92hHXMnswBkX1ZAptJt wNYtB06yJOEsUPlJN6o/nnsxboS29zC1VwTtRGbWWWeGBrOI5k6+agjmBSIGdigQizq9 HNSQ== X-Gm-Message-State: ACrzQf0kOGGpYUvbLzdrqkfWHRGnIP6KIUFyKHumTpiOL9SwDn6HCi7k XVfUzA3F31+G92IU8xhaBg/1kaSz5Lw= X-Received: by 2002:a05:6402:11c8:b0:451:7220:6343 with SMTP id j8-20020a05640211c800b0045172206343mr15290951edw.184.1664064723152; Sat, 24 Sep 2022 17:12:03 -0700 (PDT) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id kz3-20020a17090777c300b007812ba2a360sm6208042ejc.149.2022.09.24.17.12.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 17:12:02 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2022 02:10:51 +0200 Message-Id: <20220925001121.37721-25-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20220925001121.37721-1-epirat07@gmail.com> References: <20220922020400.46715-1-epirat07@gmail.com> <20220925001121.37721-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 24/54] swscale: Fix bogus doxy comment #ifdefs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bT9ycb1DX9mG The intention here was probably to document this as use of conditionals does not make sense in a comment. Fixes doxy warning: warning: explicit link request to 'if' could not be resolved --- libswscale/swscale.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 3ebf7c698d..9794f6a258 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -324,22 +324,17 @@ unsigned int sws_receive_slice_alignment(const struct SwsContext *c); * @param brightness 16.16 fixed point brightness correction * @param contrast 16.16 fixed point contrast correction * @param saturation 16.16 fixed point saturation correction -#if LIBSWSCALE_VERSION_MAJOR > 6 - * @return negative error code on error, non negative otherwise -#else - * @return -1 if not supported -#endif + * + * @return A negative error code on error, non negative otherwise. + * If `LIBSWSCALE_VERSION_MAJOR < 7`, returns -1 if not supported. */ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], int srcRange, const int table[4], int dstRange, int brightness, int contrast, int saturation); /** -#if LIBSWSCALE_VERSION_MAJOR > 6 - * @return negative error code on error, non negative otherwise -#else - * @return -1 if not supported -#endif + * @return A negative error code on error, non negative otherwise. + * If `LIBSWSCALE_VERSION_MAJOR < 7`, returns -1 if not supported. */ int sws_getColorspaceDetails(struct SwsContext *c, int **inv_table, int *srcRange, int **table, int *dstRange,