From patchwork Sat May 7 11:28:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35674 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2123288pzb; Sat, 7 May 2022 04:35:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDZfySU0QNyqA9yM01W5Bfy0Whl51rvLFsjbTsewJq2zhqmQaq/rVPxyFxUpFN4NTyUyq/ X-Received: by 2002:a17:906:d288:b0:6f3:cb6f:428f with SMTP id ay8-20020a170906d28800b006f3cb6f428fmr6895905ejb.332.1651923348597; Sat, 07 May 2022 04:35:48 -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 w10-20020a05640234ca00b00427d81514ebsi8629885edc.14.2022.05.07.04.35.48; Sat, 07 May 2022 04:35:48 -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=LyDlwh3j; 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 ED07068B4E1; Sat, 7 May 2022 14:31:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2070.outbound.protection.outlook.com [40.92.89.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C72F68B4A0 for ; Sat, 7 May 2022 14:31:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JHkMhzeR5r2oJxwRRIAAtSW9PErgILpEoGPIk+MsXYZvXwlPmbBW9HGL6WxvEOgo/vAsTWjT6zqOqoJ7Bek414RNyIV9UWnEW7l7dqm+KvFG+gGRtb4f1/P4Nr9yQJGA+1ulVNrROsw5LKySknIa88voETzeO3l4QQQrWZ88RZxRqPxflSuomIA0q3IX2eoAOH8g9Eq1vavB+9LdYrl6k5/3/r+lly8Uf9VVDPOf+DAljO1ZOCtiPuNrGWQiwaKu3mPYU4HJHxQDIr8KUuUTpIqqCajJ3uiqXlXOidnIKv2jjQFwTHbnu4PksaUmLvj0xMYcyzIq/Z8tP8vaCDoJuw== 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=8vUQiczgZjobT0x23w0vA7PXb5dc9SdphEOknz+CKe8=; b=iCpczoARaxw+I5xFRrZXBJPoL3iwRcU9yZstWuihhmCTuoucL9JehmUZklzSEBSHmLagQZL0ZfS5R86m9CfCGp5aV8kp1daGcGlZ6R+mbtoPyop1jMawvMNuaMnMOC0pwND2F5ShP4+Y9EaJ2pLZyLyjNyAyd5QreC8agXy+u6XNU1Xvx2svS8kuVEfCsWIRfcE7Jqt4hFfPjAeI53QJHfpd7PW23s6b7uxHw87MA2oXWu6mMWNYEw4eHVjznK9Dacw2INuvbp4pjQsPVnoONaKkbLQlVnmtb5L8YsoVb0CBhlfqhHG/Ztt4nm9SVjiiMztshicD4ANyaJbv1XSsFA== 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=8vUQiczgZjobT0x23w0vA7PXb5dc9SdphEOknz+CKe8=; b=LyDlwh3jYtnptEhK/fgAOUbOqMZhgXtJ2wFDmqeAauQVBY+reak9eOYs7FFKd0vEanZXZztVFNgSZYn4KK68wSjWsbYuIpGRzzn27tSrLPJTdlgc8S1a2QEryxgYQJ8iRFM8ToFMynAC5H5c2hWATKg0T8wp9wRAJh4JUNAograaVlJAI8BgUQ7b1YrufNoyhXpYMpfCWLjaCZZUvvB89uxXDLemnwmPBP4QxYYAvJBUyrBJzpiO1ocu+TIpCh3uIErbGaOykf8RQ/WKev3W9yDOr6+Rzr+GKjdCZUVur8ZXkrWQ7THsBj/OjYLk6YD8BEIDCRenmiztnEN1kwuKhQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3128.eurprd01.prod.exchangelabs.com (2603:10a6:209:c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:31:21 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:31:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:27 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [DctL4dc0/20A6hUZn58xC4C8c8aCpQ8t] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-40-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a657bb4b-4392-4b53-7536-08da301d13fb X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJIjRE5frp5NC4IyFBWce+aUYxeDlI9rvKrbW3bwML1PK16HU11+ZFKcchcvAfjdn0Glv8rtadUWWAS4U2ls5C0gWzEG4yQBgnRDvD4HZ/6Ezuuh3bvzj8xuOqe4uAE6neHMd5xMuoUaAmJRqcr1Gs7tUtCS1DjtOk9Loa5SNnUeEIpigSCEK7I7JGALzkGU0SySzLUT+NLPKyUFwJl/ceMepQgR+Yq7fzhY9oFogNJK9TYNBWje5vap/GQAv+y7v7ZI0qHWHmFCn35vWSdA43Uxs2u4p5382/K2gu0MpGCmV4TKy+NlWIDIAGVG4sM9fjkd7b4K/toEGEJ83hCo3PrYtzGEzKLGV8PeKL5q2AY7Wro/O6P6A+XgETtk5RCJHsST3iItWbQlisYQmP3xapIF28+hpz3m6X+tQeNzJBn8oivYmPEbl4h1ULvjZoeXPg/Wt8HBu6LeEUyL3FE8vPQvKBU0rIXzFQkO3KQIUw4QeJZXj8YdzRo7kWTRAateoykLKfqtBiaRxymG5+J4f/C+DFAwRW3fq7knSmi3r24MU95hynr4nnfNUSGB2j9thkO3/8SUZ8iNFUUnbBV1L/JgxC1+XwN5RX7DzaJChF2wN0mYoI7VLcmXZ/TvE0VvLiGAxCUvMfQ109gZ+e9nvoGDuA1hC0DqBlmxc4MjQv3C/lPmlE0WsIM++6WsAATYuQ4AOSiXR+tIg== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3128:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GIjWv3U4N1NA3dLfmF91JjLRwCA8HLbicuvnwe+6zUOkUUx9rvD9AN4gmb548WJ6yDtv5au8/EUYcuj+wlSlibpQ5L1VsaapnLxAZTo9QJI/L6j3G8ekyr1EtilrJ3kbJl8RxwNDMDDJQydbOMaWqip6WzS3fQ7h94of8hVVvP+5P45ErG3tGJD4Li3iWGcu65MriE2/ucdYDhbqTU9JEq+b/yCcuMCM1/sDVKB92ocvBTxgVwfVCZEOW2jvs9rxIEBW9fl4EzL1izQ3Vv8QpK7YJNxIX6HZbjZigdUoWzQAciycjIsoc3s8euW7dl5JdQdmmE78PGlX1BHf2MjMj92yBc3YKpnHMyarF5fjsFixbw45ITffABudxCaoiiQD9cXg0BSjJZC97oRVLxaJHoF+wHpZ+EJe/jOyFMh3tfbcsRS9pxxej2s/cwHvkLJRiEekyxmZu+IOfggjPNrBfqzukT8ZnbaoPlDhXydZU1YfIfIqKl1hPQpuufj/dn34OpKLJiDZSecWeFjGeFniCMX6mOleFS0YSdcwfiX0d09PRbBTypatGVWzY/b7y32NQDan/iDI4s2nJpZhnrvvFzO5cDnfk4ezqt2ccJtXZWtLtU0OooLkIAc/CYhHnZWT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eNcWv50VscxQezRP85lw4wtPEjyrSRaGFRRW2j16Bs58tc1dFPad1A4Les9IIcZTZlgfCRXx9e1MjfZSWmKqb/jLYYeAs6ZFdRZDwdbgzcGV8lzHRj3m2nZ3oL31Rkj0hNl7uXRadR8bmsRnXG6YJKd5J4qRN4JpBjI/hhiSTKHEUfz4iEqYqUzTzCpeQD4ptqwXSNTshJxAJKjhXDBq32tfZPmUs/kLfESbZFD3HYB+OMvk3ubwNAY2UcHeNDzwTz9ATXH8by/b5/+fx+vUhMJxoTyeVLQoxizl6FwB9E2tqFCacfigb2ylHUfwXgT36Fh1m9jrngaXlNz1JzZEGNOKVo9sBc0Wzwu5hDMGiQS/zKH42nbyMFp+PaN4+eS0e878U8MwEhf1TLv4dS0h7WcpR95E49DzaEZF5DklVYyTCfyAGKUOZBwlDWPEzqAnoSWuPG74z5WRApPddWE/11qRef3twy6hlqetv5dcXIV+uUd9I37deWH6KtFMwjG2kabt4jGKdIEQJ4ZXONF6iif+tp/C69Jovq+I2f4KHyPBKPv3BTMoGtnRWF5joRX06JAFJ1xccUU27QcQyyMXznFsDD7/nSpIMT4EXD2R8BYWZZFSyHrWMKoaAGAGHz8YqfHD9HmS64/XVe6rtMzYWXOooPnmebzRLgwpjYO4d78065BbBUliTR91psFPcRLzOdfsE7YOq3921WzLZ3dCJDFQfyx+vSPmfRcKp/0fcpYmkBiA8yGuf0UM9+YZcPIdSHYRdQukNF+lLArDowoKzdwITYLmTCLsqgzwLUqPqz0gwLeqJ7TKvbUZ/W50FrQYkvIXVyDVbU+dRtJYNH/vDz6xEjLx/44G6rT0mqFmCw/JAajeWddYksI2ypri+tR9COsJFdXBdwwWfIMcZYaqGnvwzMR5K0NmH23yCb5sQx4YxkJLvfaGiIXqhVGY0HJ9qupKyrUajsC0GiuweiS9mhHi63ywzNkl2J4J0/E4K6kl2vneUm/17TqPjsTwCVSLalPi/8xW8i6HzHZSEs8Q7AZxalmAruAjB7w5vbKV9amB5471g1ZRP8Ed6oWO6aOyXpOXv9knXAdFtTvITegzR/JH1H+5sDl8IUaErfFWZws+PjHaMhSdOE38eU03d9Fc9IsLgT/bYKqBKBxzSbaGrbgr+l+tV3e6zn/pLVd1uciYqXY5eFKYue1ydqstxiGJbFTzqUFF5gyx+bgdHsp66lh2nscyAETvSM9D3j9h52DaiNdLPPZRHbV9JkjW3tVlPyIURbsJ1FFgKwtumy67eQJ7er0DESdOxCuiKpkiJaT1cQ5sp7C16W8AgbmK5KddQTuT16GEKh8fnuOyqsmqpQMoWZSyAlnnl4+vPZRW7guhRHLE3hyXG1SdOQ3FjKoGGcwilkKr2APiDOrh3AfvnODj2rktZXwqG7DFR7e5bSyZI9c5zYBoPZakeDXTUcaX X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a657bb4b-4392-4b53-7536-08da301d13fb X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:31:07.5340 (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: AM6PR0102MB3128 Subject: [FFmpeg-devel] [PATCH 41/44] avformat/utils: Move ff_copy_whiteblacklists to avformat.c 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: nAphovmPCtEs This is an auxiliary function for AVFormatContexts. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 20 ++++++++++++++++++++ libavformat/utils.c | 21 --------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 414224187a..2249f09825 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -681,6 +681,26 @@ const AVCodec *ff_find_decoder(AVFormatContext *s, const AVStream *st, return avcodec_find_decoder(codec_id); } +int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src) +{ + av_assert0(!dst->codec_whitelist && + !dst->format_whitelist && + !dst->protocol_whitelist && + !dst->protocol_blacklist); + dst-> codec_whitelist = av_strdup(src->codec_whitelist); + dst->format_whitelist = av_strdup(src->format_whitelist); + dst->protocol_whitelist = av_strdup(src->protocol_whitelist); + dst->protocol_blacklist = av_strdup(src->protocol_blacklist); + if ( (src-> codec_whitelist && !dst-> codec_whitelist) + || (src-> format_whitelist && !dst-> format_whitelist) + || (src->protocol_whitelist && !dst->protocol_whitelist) + || (src->protocol_blacklist && !dst->protocol_blacklist)) { + av_log(dst, AV_LOG_ERROR, "Failed to duplicate black/whitelist\n"); + return AVERROR(ENOMEM); + } + return 0; +} + int ff_is_intra_only(enum AVCodecID id) { const AVCodecDescriptor *d = avcodec_descriptor_get(id); diff --git a/libavformat/utils.c b/libavformat/utils.c index 866b80cffe..26f44ddfa1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -23,7 +23,6 @@ #include "config.h" -#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/internal.h" @@ -56,26 +55,6 @@ int ff_unlock_avformat(void) return ff_mutex_unlock(&avformat_mutex) ? -1 : 0; } -int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src) -{ - av_assert0(!dst->codec_whitelist && - !dst->format_whitelist && - !dst->protocol_whitelist && - !dst->protocol_blacklist); - dst-> codec_whitelist = av_strdup(src->codec_whitelist); - dst->format_whitelist = av_strdup(src->format_whitelist); - dst->protocol_whitelist = av_strdup(src->protocol_whitelist); - dst->protocol_blacklist = av_strdup(src->protocol_blacklist); - if ( (src-> codec_whitelist && !dst-> codec_whitelist) - || (src-> format_whitelist && !dst-> format_whitelist) - || (src->protocol_whitelist && !dst->protocol_whitelist) - || (src->protocol_blacklist && !dst->protocol_blacklist)) { - av_log(dst, AV_LOG_ERROR, "Failed to duplicate black/whitelist\n"); - return AVERROR(ENOMEM); - } - return 0; -} - /* an arbitrarily chosen "sane" max packet size -- 50M */ #define SANE_CHUNK_SIZE (50000000)