From patchwork Thu Mar 4 07:38:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gaojiangjie@live.com X-Patchwork-Id: 26084 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C5F4F44BD3B for ; Thu, 4 Mar 2021 09:40:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 987C868A8F0; Thu, 4 Mar 2021 09:40:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-oln040092253014.outbound.protection.outlook.com [40.92.253.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6035768A32E for ; Thu, 4 Mar 2021 09:39:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BKSpu+5hZ573j3kxWXRHOJo1yT6aDPm3Bh6XVFdBJ6vxle1fbdg9H1eInD1CqrKo0cX8DvhtjfcjJfqUqwU6oaKZSy/mmCgtz52vsjQ9gEcV2kRJDTwvnwnC+jy74lemZsciPR+ZpO8xkVRzY6ZsLYUulEnJFjL/iSHKbHjExCg2OnHAY3vLhiGJ2cV6BIDmoLOhyaQxJZIq5B+Mt9Ol1OI7HuTq8WoHRTt1L4j6n9KjHGAiXkmF08hxWR94fP4INx78cCsrW0pYFvNgddWJ1fJ3MPUskBofEdMAvDUSCRfLk0BcGNHPozYVAGHdzAYhjfxYPUQp46JT/Kjf2kp7+A== 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-SenderADCheck; bh=d2OEFwZgHswfoTPgLnNYTNiK+57FptrzBLaVdKk2x3I=; b=LaXK1f7JYtbEzQavqfCUyPn895FVyUYYU2W8RjHpx7NDxnElpw5oxaN5oRnjI68GjvYXZqkS/qZQCloh9Pf/9g081aM36khL+uXK79vsli6M0lgGBOq/MJytIhXL1pBvqYKb337DtfjMbi0PMc1FaOl4o7XxhM6r+FF6JZbKFt9BwCxD2LK88/zQYJfNbb676vyIsLT9b5as6G0VNQiLePVaK+EWlgbkcf5YiI7bWTOfzo6+Ogx9f0IYibfKCuGj3jpRn9KoSyiW70zlIfwQHIFAnaC0nQF8m1U+ToEqT5xC0/fkJbacFnZHV6pdBUYXEMYE2eLXAQdmxCTAtGGynw== 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=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d2OEFwZgHswfoTPgLnNYTNiK+57FptrzBLaVdKk2x3I=; b=RWBSIuGoWA22TMu++MIg3KxuvGZKh0+9BB90dSw84TjNs/iX/YaPgWfDZD9Mo60K2pVSF5ywgSt7VVXXixQ7UU3AH4SeGhZu1JjRhoa3LF89kgLwdgwRw5CAfeoZFTYgup4rI1vWcACBfxzIK7B6QzEWGQ/skzuRgt9kB4lqfvRRyi/IMsAyPRFdvqJ6jjdCzB+ysWF4whqeUn5sLcJFYZiCJL1psraguXz8o5wMKlo5w3fNgON/mcDAf/JozDVn0ZIB7lH9HGK2NZEEIi4Pl2TMaa1yTdI8L/jBErGvEL2/5yPYyblpQT1n+lsVABMp1H61H//7RNlQ44Kccj9Q/g== Received: from PU1APC01FT056.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::45) by PU1APC01HT069.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::303) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Thu, 4 Mar 2021 07:39:53 +0000 Received: from ME3P282MB1812.AUSP282.PROD.OUTLOOK.COM (10.152.252.55) by PU1APC01FT056.mail.protection.outlook.com (10.152.253.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.19 via Frontend Transport; Thu, 4 Mar 2021 07:39:53 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8F176936CECDB351A7AF31BA2AEF81B1CF5B69D3850753FAB769E4EF144F747C; UpperCasedChecksum:DCA6B7F12FCD32546A3D635C43AA2A50DAC02F687B5CA506EA9E9CD079EF5EE2; SizeAsReceived:7261; Count:45 Received: from ME3P282MB1812.AUSP282.PROD.OUTLOOK.COM ([fe80::9cba:838:798:9cf8]) by ME3P282MB1812.AUSP282.PROD.OUTLOOK.COM ([fe80::9cba:838:798:9cf8%6]) with mapi id 15.20.3912.022; Thu, 4 Mar 2021 07:39:51 +0000 From: gaojiangjie@live.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Mar 2021 15:38:56 +0800 Message-ID: X-Mailer: git-send-email 2.27.0.windows.1 X-TMN: [gkxsfKpAahOJ+DQzHvE4DerNziCJlWBlRCKXf9rUspM=] X-ClientProxiedBy: HK2PR02CA0169.apcprd02.prod.outlook.com (2603:1096:201:1f::29) To ME3P282MB1812.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:a7::9) X-Microsoft-Original-Message-ID: <20210304073856.1602-1-gaojiangjie@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (218.104.205.114) by HK2PR02CA0169.apcprd02.prod.outlook.com (2603:1096:201:1f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 07:39:50 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 59e1c839-16b7-4b27-8483-08d8dee0b214 X-MS-Exchange-SLBlob-MailProps: /mB5ds43bCF6PkFWf+/XOR1aDmguDNYQu8mIEJN/WEnsCZHz/zcDTW2Lvn6BdSFpybhKSvfTzB5TTgdkCsKvrdIz/lIawyMjtqLuAxBNBclBTZfQDBGKA3xWm4mgxxA4P+2CGukE+okjL2YOEGRmKmNUYDVGXjLk2O4UAfFCK69lnqVLjHqnwkfPAp5mzlDVrYKgRmNL6NNdPEHgQj/Ag/D1XjrwW9IrB0QD1V4BdVaFkpXe6FVhJZ5tvCF9Ia0GBu0MZLGSef2+t/f5JmU5ftNCWYj70eI2mpe9oJoDd1L/eq2Wo3YY0jpi+2vOfMJ5NoaZJsO6DXC8fK9RSecWYO0lUX+ZvPvzWvkUTybSy23FHp07rZNiUQATEBemtt4L/0+mv6ysJn6Dt7peyfL7cWQgODXzje6NoC5sOXRkGsPqCCtbUFHg0pFwVfB3YKyE8HTQdUUDfeNzwAj5ppnIdrCkMzlGsZIz3TdWt/Mur0Vfk18fhjCchRcBsZXMZN/1rszTFn2zLVVrM8LT2MenKRY1+KbD0rwNWykhA4AiJmbLrRkO/3CsQi1IPaJ3ZP2B48XuEc66PTlmXGDYVSj3mprq9o2c16LRwIx7huUBXx/02WiVHYKQQ1cBiDG7zfsy7LtDvWnB59m8hxc3YTdSu4fl75V4R1yRCPwm9FqYeNqqkfsd1b+BQCPiYKUs3jeSs1Oq6p0D3pq9Numt0e4zI13Y3hgXs1cerf5W03fVKj7of60JI/c14yCEbrHejANORuLNq9BbX4Z5oZEKNER71Nn0n3kZFLDfA0CPiCRkphDcOT3JKlv0minQYb2W3WgnWB/XEC1AI7mGE78u4QrFz6BbfoocUr8uFksd2izTasqmdYcAB8jC9+XlS+t+LsbOYJp+nbzpmuiJgtobagCeo2bqh2F3uSI/W++dRjIIoe8= X-MS-TrafficTypeDiagnostic: PU1APC01HT069: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RAR5vi9jCqx3d+pEqrWsKXqyPY6wb5EcEwf2DmIls1eXTom5pMmX998NorZBoHQfV490UyMWoHSCkyTCV2P3QfG7t2KduVo2VdehSS3UwcByCjA6iLgNY7DGTjY3J9ujtzIE/wJJLkiB1+qiRSqSBLbV5uQxqJny3lMOPRiZFch0fvZzi73AASrUqm+NfWEZMXIiehOI8SsnMlL0owUye5XovYyGOPWBa3g2cJTfiObNl7DpcYIwxF4Ei7J7XYHwZB8sVSB3PCx0KTURbrCdlZjWPqO6z2SrQPPM9v0WVb1bINJOTSXfy7y2T3ZscglJPfOua9B9E+b0mtGlkEY52PL2TgkK6W22fSX6PYXGQhn8P4mTpngw8uPowe2odG23nnSgtps7KjbmqWFVBeWPDaT1KSG280dNJf9UtmmXa74/pmoLxMlKOAeNxKfQu2aa X-MS-Exchange-AntiSpam-MessageData: HfquZlEpy48K/ql4YlcNLISsx4Se9r0yS7nL84O+yFNlB3Os/Wm8TfEzqvI181gidLsFdEyr5PeJ2Wygd9D2VmHZWQowHuLQLp8kdwjAhjLA3AACcXwA7/8h0y4N5CgLRn7kasF4cR1Qa9R3covL+A== X-OriginatorOrg: live.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59e1c839-16b7-4b27-8483-08d8dee0b214 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2021 07:39:51.8717 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: PU1APC01FT056.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT069 Subject: [FFmpeg-devel] [PATCH v1] avformat/rtsp: fix https://trac.ffmpeg.org/ticket/7517 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: Jiangjie Gao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jiangjie Gao Signed-off-by: Jiangjie Gao --- libavformat/rtsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 9a2933346e..29ee0b317f 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2510,8 +2510,9 @@ static int rtp_read_header(AVFormatContext *s) if (!ff_network_init()) return AVERROR(EIO); + AVDictionary *opts = map_to_opts(rt); ret = ffurl_open_whitelist(&in, s->url, AVIO_FLAG_READ, - &s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist, NULL); + &s->interrupt_callback, &opts, s->protocol_whitelist, s->protocol_blacklist, NULL); if (ret) goto fail;