From patchwork Sat Sep 2 23:12:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43497 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp399717pzb; Sat, 2 Sep 2023 16:11:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGiC+ql9Uk1TQ4HFuM+3icfVDBXm/2pDKmI02EgGn5FTT9WQKD0zSJnnbkSLwaoDllMzEs X-Received: by 2002:a17:907:b12:b0:9a1:aea2:d18d with SMTP id h18-20020a1709070b1200b009a1aea2d18dmr4326604ejl.48.1693696277993; Sat, 02 Sep 2023 16:11:17 -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 e12-20020a170906374c00b0099ce23c3a71si4022658ejc.1041.2023.09.02.16.11.17; Sat, 02 Sep 2023 16:11: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=@outlook.com header.s=selector1 header.b=fsYdbn6A; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C354768C637; Sun, 3 Sep 2023 02:11:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2045.outbound.protection.outlook.com [40.92.73.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1846C68C5FB for ; Sun, 3 Sep 2023 02:11:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tah6zw+1Mo2c78BS8/PhGLJPUQVRQ4RggG2opm98MJ3NzBQws2OeaQ4gqHa6Bd5WfaocD/6HuHM9/VhuMhwCKscQeGvcpTh37YvQYKjfWZ5LZ94tc1O2SSfn9Gszqn/o1MAsc9UcrY2/C40s9jTziPjIAxX26Qib7qsV1Um7meAfK6iCfNMuB38ZBaZeu+CmKnJX5xwUB0B32UvRpqsaGjU9CehmxQSCMDqw9WXId41hn5VdHbr+crUqyNpzI+5CemtR+DEZ/oQWPxqrbCLqTGm3mwFZ7ve6ewUVUsFr7BYxN2YUcWbAFcfj+Zpg1IGjpUPZ2aPuywxDzGGr2Dm4fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yIJWDAK6OqsQCaA24KniiAjDa+nkGZyoF+sFBvA9VXo=; b=TQqquhuXR0y8j+ooknDR75O6LMQu7JrYXXAwVDohKeeZQ7CI/ACiFNl53JAle1vKBI0+C1icrYoUMebdIP1nXIerhw/xsaKal2GvYiS1/9rm5yPGL66OMONU8ydbrI+m1uFracW3hw1439Pqdg2H/Qopoyb2zBPXOOOqn585pV156wFjZIuHGXwDei6fQdskWmy6UdY9UNDXVz/MwKchOu6YVFHkRMDtT7iGwufsWaELr3LTueCKniKwPAaQHRtdDrT800xIwHByzYnv1LCj4FE+J0pPj1lzXJJwamzYpxC0pcQbqGDkr35wXoiTmSIt0dX+ca7njbMgkThoBPKsDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yIJWDAK6OqsQCaA24KniiAjDa+nkGZyoF+sFBvA9VXo=; b=fsYdbn6A6fRGL354DYTmCz8w4kiOof9trzweWfcj/4j3za+MHV97tUbY3RcQijvMVSdveRC21yC7p4vtCRNdvdcqWBPlBNegpPtTtifTVsPt075p9iBM66JXCHRr9+RmDD+SPyQqCAbN7KZ5blnGV5ijm2r6mCWgVNRsYNl/RqtR0dv2Hk1qELKSgBWMRSQr19APZqB/qkBaNwYZOL8Xxo2hWFF6a0etq7RnJUuWge2k5AJPfHdV2eX2JfPMfH5QtLTbI4qYD5WyDjWUSTATeoUfJYH1HcEX/KIwVXewylGSdllP34YzdnW7tlGF3XxlucdUsNfDaajLSNlul0zrhQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0133.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.30; Sat, 2 Sep 2023 23:11:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6699.034; Sat, 2 Sep 2023 23:11:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Sep 2023 01:12:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [pyCIg8PwiyAFtAO6Ly2ffIdubQPfPb8aIMh1SwTGnZY=] X-ClientProxiedBy: ZR0P278CA0008.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230902231216.1400729-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0133:EE_ X-MS-Office365-Filtering-Correlation-Id: a0e4ab3e-3df3-419e-8edc-08dbac09e198 X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvuzPRaje3DTN2pNab8ddT6JXPZKJGY38Oc2voR0IBlnhGkvQZizkle4XVyHjw34wvkhZrvYZz+FM4k7cFBgCAfT+1EZepjSlL2Qot1u/e4F9cVm70bspIadrWsUb+LVYgIcdWFv/4o/x3k3mqdV6cEGCmU/yLMav2qFduH/U8/uSM40tIurjQaLaq51CnGBuGy5svvMiF+g287euMmwpcLwFo+5/mPvFHHaT83bizP300pZNWaiIyy/Ukm2vLOGLG3oru+NgtYH5MokSN0LeO1qhr4ZU0B/T/QlpLjkFM/oJiPA5mUQB8wKtQMUFUGghA6wUSiaBt3ETkcYTAnZxoF6Q7PkxharFY+AEDCoYxs++cinVLjdLMyJP4n7ooyhLbnr5PXMGbk2VoCQxepgYmWy8eaU/ZAuzUqbo2UxdjttkmndjddRUIntPYYToiXWz0hYnBF5JSKIIJeTuvQ2DDOsKQ6GwJggHgdIQI61Ryk1evs7NcpbqqvjOc2KnGuEP505x8mGoEfOgAPWpBO9Qdb/TS5mEDnpE+pqdvzizSab3Wzv/Z1P5D66FWeWOdY7IM7A7w6x19lfIn1HYVNe0ZqmG77UuYQg+r1JL/EysGY4vKMMJRO25HXz5a1NbzAP3kcrXRa8Nb9Qa/ssC4AZB6mHVMkb2dj9PR78zimeZrxd6JPjhAos8KlftSP6Gw9QsYs1wC1D+bKTntxCsEi1l0jrUtVJ3ZDri/+Q9FqZx5E9zqr1qwcuFZILFbi0D6LTn6U= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8uH91L4RF//nSrRlzhBQiu+0YF7coADtyYlYanh2/XS8ch/nhenqNsbxCj7vz1uxN2Q76hUhTcDrgVUirlBbDbFMKyhYqyI+SmT2imQCh1EOpM9D5toxsoqiO1P2O/C1bgfMF3dLxSRuoXDgsU8enU40cfXAimqjps3Zc/vMUn1MseLM2dvBEAHQsdoGEn5SJcTxdeXu+NkPz2SR3bNaNI4f5KocYIZ5Bi3YohrQi0fPsI3j4BsjS2xh0Ub8yW+aXiSskmca2Ou5mznv++cmJMRSalSYH879CJtcfvA86Q3vcWCw9TCSwvDNfaguZPlZ1PMLIprC26xcOyeLFabyoEw30S9Ra6K3+i1xP6Manoo10ee8Y1KUUonDthagPTa3OQ+w4pHHw+hXR9IKeFejLYW/818ONt8V5fsx6svggwYXuJDPioM312J0GuLtdsezPvpViz8wMXZA2jdpId8nse8GWFECW7S+eW9HaCMj9pKxpxvDvBSQQAeQurgvaISE6knRniiABUdNqyPHXh/gAgg1YAqdUVh8xDXh+CBW5FmN3zpjkLAvvRjIEDw6BhdkOotRiAS5eUBNcZ0/8tq1v+lNlyCnWveFLqrvpXe+eSil8oh1ImPkzXElH81TyGbd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RP3IuIp06/XQG9IR/RFpy5zH/l9SA0RrLXD4bje83VjxtEhXCImEGOHM2h/gziIBMz0QfQ6xyYpcnslh+gpbBB6p/FeMu2AB2cjr1B56kULoJ6C5OcvUxhe2S/9A3u1Bz/3CeJjwYeN/UlSCurHUtFDcYsBK2cUbBj4LNn0r10vNO66Tn38pdIcXNGfq4zgcXbDBFTQoi+zylRxbl6CTMS5Elme1RFH4oRzbmoMMJlBefGocRrLVjgF0hYUMa/lrkBx89xKPMBPVPKvPOE//jbesqUWhc2BmfwmjA9hDxLyFGqtZDMfrh0EJoMizbyUnanORY5a/REu5130/7Fh0dpte7ugdajyF2MbHE7HmiXKE6hO/d081ykdR2g9Bmga+f5Wp3tpUQRIwcPG/NjJMsrhFLVIuvv/5ZyRPUEGr2/7kCAFC2y0RA3/KRB473HArOiRH1aM/iRc0m/nXyvq2ofsGjrHZYs4TWSI0MlXapQpl4QxyQvKIqd2Itv+7qJZWSFST9IZdC+B4VUvb+P8rq7YLHMif4BO1DV6Yn5bTbuKaoCIdrFIVmM/GvqJ1Xt7USX5v5siv/mqrC4XO1fYEmEl4Wv5Wqj4bzz4MR2dzHtPc7s29a9e+QWg6i9nsvcTymqVfBeh2nR1dyK07OT1+Xsk/sRUXnVc8IaG8c3oLQHV91/NTNsMB/EWArcRq5m9NO+XcK1GQccIJdb5qi414ieR37ArlM2puVA4AwMYl5jUzlUpSCqa6iaKi+zbnqqUyoQIpolb+l2lRTDxqvm0WcLmIbbRpx5VTqGVr7Rg6qn0aOYOK4aMUwrpz5ItodHv0TeFnRSBoVTJCNBGy80JcufeMcL+1PVRdc7G9qgQI3dZGXkW76kUkihXF9yXjbtruty8YChoBhaRMFUtrHXu9M30wwrsr//J0ITfYs7sbilHtWQPzcaAwYrL0rKSYL8Vo7jxBS/KSJ07nKtT8mGiAolAe4a60bFCa8Wzt6t3i4iGFPuKLur18l24Ii03zVS1seEBcNn+QRqZjsUEdIkBv0JRoirOXjgl/yyyGiC7zVXP7ZgX/itoMry6NCORGMHz4v5PdRLeyrWdZ5VxkJ8jS4WguiE1o2MeDqAbMr7SoI2kNKdmD+wVxvFDXCacLuuuCgPZQeexpRvjB5lVwZkDxMCAPlBikmR2T4nUL59/RNoMjndZcV0lnmunC7az8r36zzmmQ26E33NnFaE0AwbhFghiz0OEvMaMEvCftMmYsbIl+PUiromgGVMzuWdTiHO+U X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0e4ab3e-3df3-419e-8edc-08dbac09e198 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2023 23:11:04.5287 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0133 Subject: [FFmpeg-devel] [PATCH 8/8] all: Replace __FUNCTION__ by __func__ 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RuKT3qqRB32j Only the former is valid ISO C. Signed-off-by: Andreas Rheinhardt --- libavdevice/opengl_enc.c | 2 +- libavformat/apngdec.c | 2 +- libavformat/demux.c | 4 ++-- libavformat/mux.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 80feda7072..b2ac6eb16a 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -152,7 +152,7 @@ typedef struct FFOpenGLFunctions { {\ GLenum err_code; \ if ((err_code = glGetError()) != GL_NO_ERROR) { \ - av_log(ctx, AV_LOG_ERROR, "OpenGL error occurred in '%s', line %d: %d\n", __FUNCTION__, __LINE__, err_code); \ + av_log(ctx, AV_LOG_ERROR, "OpenGL error occurred in '%s', line %d: %d\n", __func__, __LINE__, err_code); \ goto fail; \ } \ }\ diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index 47cdbfcbfb..8f5f37a2b1 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -274,7 +274,7 @@ static int decode_fctl_chunk(AVFormatContext *s, APNGDemuxContext *ctx, AVPacket "delay_den: %"PRIu16", " "dispose_op: %d, " "blend_op: %d\n", - __FUNCTION__, + __func__, sequence_number, width, height, diff --git a/libavformat/demux.c b/libavformat/demux.c index b218f64574..b8a7a28c52 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -2533,7 +2533,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) if (codec && !avctx->codec) if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) av_log(ic, AV_LOG_WARNING, - "Failed to open codec in %s\n",__FUNCTION__); + "Failed to open codec in %s\n", __func__); } if (!options) av_dict_free(&thread_opt); @@ -2790,7 +2790,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) av_dict_set(&opts, "codec_whitelist", ic->codec_whitelist, 0); if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : &opts) < 0) av_log(ic, AV_LOG_WARNING, - "Failed to open codec in %s\n",__FUNCTION__); + "Failed to open codec in %s\n", __func__); av_dict_free(&opts); } } diff --git a/libavformat/mux.c b/libavformat/mux.c index 0cf9ebfc19..6c6c677171 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1120,7 +1120,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt, int ret; if (s->debug & FF_FDEBUG_TS) - av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __FUNCTION__, + av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __func__, pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts)); guess_pkt_duration(s, st, pkt);