Message ID | AM7PR03MB666096A595AE8F8DD23D89758F4C9@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | a5a99cc11c7aea587c871d6ca3fc80d9f9828e27 |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1535140iog; Thu, 6 Jan 2022 02:52:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzKVOvBVGtdWFIT8O1ekILCWdadEv4P9KCFGYl+IR73+5uUqbfUuom0VIuTK6rItA3Q9Ty X-Received: by 2002:a17:907:961c:: with SMTP id gb28mr45118072ejc.385.1641466378081; Thu, 06 Jan 2022 02:52:58 -0800 (PST) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v25si961171edd.190.2022.01.06.02.52.57; Thu, 06 Jan 2022 02:52:58 -0800 (PST) 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=QRsqeoac; 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 F313068ACF5; Thu, 6 Jan 2022 12:52:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17CD668AAE6 for <ffmpeg-devel@ffmpeg.org>; Thu, 6 Jan 2022 12:52:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GaePIGXYw5uzi8nBgNj71DKb4FoT3MdyjTP3/K8a0mxRiCOc7FwApa/BDKN0JAARDqJv8oBmvKoWuxC3mGYrI4QY2nvUN9Fn8dIcjrdT7yNJHQh9ckDhM2MyJ3igJMhexZADsCcOKmQVTiM7dw+9FUrAhcVBrTU6Rb803Wc4e75jkh0SFuo90JkZOW4COgLT5nruLZy1e6RdT7EGb4F6tEqWFQzvZpmTSEDnLEUDWLwBtNu++vzhpgANL/6/jk1AV21FmXCnuk+0/DUjEYvdV8TlZ+zWYUof/PJwNjZDGvfktvbAN+DvMx76jyVycbjq4KvP+VSbfw/OapYzlYNgsw== 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=WiCKt8ydOrqPvSyyZ8mlnVyK3v318FV+D7dSCAnTNRE=; b=PXPR0G1whj/X1NYhyZc/vJDOAkilgBYIJhgVDtGRF436AjchUl4fmLd0iIfjnFXrk1I6H9M0zwui/rZ0odDlL0zE49/XuHRYs/uGYrNRAsKJ1TZnG/alPOFp2DLROt5GusAzve1SQJmaKYBxVC1vwqo/V6fQSZuZHmzdfoNTZa24h01nTsWIEqi29TBek/KHLO4e46TOe9h/hTyoikRIj40/42zu/EPXXibXliBlNqVj3qYQj07YCx3E65urF7IqVI7HHHX/8qBOmVUml946RH1FynIaUump8tGKLXA1LJFlj3CUZjuHyZdBbJ/Lzf8At83oKdBoYblZljKHp09idw== 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=WiCKt8ydOrqPvSyyZ8mlnVyK3v318FV+D7dSCAnTNRE=; b=QRsqeoacmlmNc8MzvleX23r6//cxdasJrl976BvrZZYzAt6Gf2M96C3+mM2RnaeNPJQYA19w65T/J9ynUv2l0nLjjEt1kVobgy5Mh9MrBBFuKiIu4/B7IKQNf4lbPJBl5xNOb5X5zTZI8VTqiuieddvD/02cujqO43HMUW8B/D/nEKHOvVYBwuT7dGC6WtG6RpsEklFN0nLmpBdkTn+4f+MI+1Mnmur2SNvOxuAP75HkMxJb92h2yu9mFiV6qhNwpNdLsOFtJmyDR5l7zz7YRf99CwpEA24aiY9YF+SO/tcVcGRqh+vpio84k5uq86JbUaYHDmbIOjaqoandu4CTJg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4294.eurprd03.prod.outlook.com (2603:10a6:20b:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Thu, 6 Jan 2022 10:52:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:52:36 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 11:52:25 +0100 Message-ID: <AM7PR03MB666096A595AE8F8DD23D89758F4C9@AM7PR03MB6660.eurprd03.prod.outlook.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <AM7PR03MB6660A38F0890A5335301DD558F4C9@AM7PR03MB6660.eurprd03.prod.outlook.com> References: <AM7PR03MB6660A38F0890A5335301DD558F4C9@AM7PR03MB6660.eurprd03.prod.outlook.com> X-TMN: [2aNPqv3BLX1S2n6nIT2HXQdbYiwTyMU2] X-ClientProxiedBy: AM0PR03CA0106.eurprd03.prod.outlook.com (2603:10a6:208:69::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106105226.2200689-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd17ac21-375e-4f6a-3fb9-08d9d102a67e X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4yb2nWv53CVoeRcZZxd39mmNBSFvXIDbpvLT7gxLN/Zggd0Vz1zquO2dZ3coVV/9GyglFKXeCKnO9qDgu8KXI2A7RwZmJeZlABHd06KKmcsfAn7OQfsQ1llconOV8EggJMGSwK6FgVbCWcrBrnt7WCyWwEVgOyOoJ1UvHDTWqsm5uSmr66lcEf24o66RcxodrrmpDH1NajY52SL045PEhIFtVf6Gne8qkNn7z/Xj+9dc8d+cC4OUSeNlmiKLS7fv4qQAs7+SCJYQ1qu3fLFPbcjx2X8DrFeZomnyAdIXK9cWkK5PwpqLARNuBze7zUeA/c/QciHbKoVbKRekEJD1oCQeGGk6uB2ro9KQnoB7lUE39ZNjEkHrb6ioBgFvNfLme4RdHm92ASvB7uPiiA5B1ZkHXoKl2IetyoOdpyQe9vAzrfevGuS8XhByZdjyv3GAd6ND8VmZNWvB5LDiltQIso+h7twYZAy5s1wDeTjdlvqTkGRsQVAMTzs7rT2abo3S2EP3bu5cWK7nm/9Q5MoCVkVZAhenjJ0h5ZOLPd1iDWRVTmqMBmV7La5Mqh/9NkeS2EtOfY2UHW454Ld0uL48Z6vLceIksERy7NI68LTNHCFo3uoL0b4j4i1YoLegzN4QKr+9Q80OoRLgdbj5UGyvA2HKrFdrDuD8Rf63hGscO9P/Vj6Ftd6YClo+sGeo+zg7Ne8X17FJo724o2Dl9+NYDKD+7Yo6V91wZWxe/WEkZ/fS0Nu8D1SpcCZCbm44PMOfHIP X-MS-TrafficTypeDiagnostic: AM6PR03MB4294:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p/1PAzG5EI0NoODtBdCpBrECbCGe/TMWHAMorvUOXC3gCKce2MDMVtOCboEilvIe4lyjd++HQgKeI4JiPgPITrxizPqM8qFPrWAeUjdH06UnVOxA9zjChpG90F+G6d18wc9UKHKQtDq4unDAUUJMEl1XJacd69fAVId9Gx73HqwTpH9SVMU+mcRZFQVh+BHauAIkHaGuWLDcSs4VxL5fVLgHZbZ6WTNt2XVB4k2lXMcs6uWHVAkFLQf3bJjkSAnzuMl+Fzd6tAhvb08dqNuDp0/fEDKQTgyo1tU06cEhKJXx5z5H6wkhf4mYXYaKZ+r4x5acoAXpz7/WmdT1slIylF2yonWITnQqnpubrhg8zjw8TkCxsJ4hipRi2rYBVLVuB3YXOf5NgxSgkYwrJkV9GYz5RpM+uIz/w7x+Fluzhc+ykWCTIAXXYf8GCf8gPSd2p3cjLbgzJfmdi64yNUH7uLwLMMAMDjRaMS0mV3rI4Jb0JlCstVGhflPvYtF8TrY4T0XJ2k2Jy1qz5kPIKABGqd/yKUQUyP/DJ6uQpTX3Z4h8DWeLZDLIF21cFqf29t4Ee3fN6FfZV0x6Mn2D67uuzg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Do+2kSWxHX7McYE5XFxckxrXlX95/uFKC3Q2DsfB0egGv9eaBa8ZPxfEqfrDQuLJgaGERub9FX0zr0wj5lJtq1X/g5DZ9DivCFKuR0/c+MsTCfnqna86V7dSKtbnM8Sl5pw8zhgBKT4e0oejPbOtYa8HXzYUFloOeiaFIJ601hnR5xtLfkbFJyVaf2YnGMhYRR3WVXv18wDV1WIU2hXFbyANL/6qGpCrP5jGsACk3ST4kStVhgxd2zUtYG1M/Mr69hRixkszAraiBdloi77jJHdiB5Uu7bXDedH5H0QCTEuy09e219+R8Tl7ia8WsGAGlfvzjkQx3FufAmRacsqs0Y2cNNFY6YjztAPi8uFGGvXeEfPbOHvwVx3YXshL70Fs5Pe9nln5zPEE7t6l4lzF/lN1wFw1bPtXnYfazdEgWA106ZJ0Q+8TbSpAeGsRyRW2v+fROTPeQUfMe1gJFgTuqN3kJrZPYDYXA1emSeMuvrMie6spqOcfC8Kt+k7QUD5QyYUVIM81CV+QUvFu1+2uZrnIihb8gE1cBtsVPDgCRP3f+ggqbD50s9lWD32t3CKCraLXO8bb1FcbrAiwns4qsYonvwOTCND0cjvi0P3/fkL84QVgwZeSaPGySU1qwGNkLmFhy/TMR9KhG5ON8pRdmawuPPrL0ZJ+bAnlvUPuB6Pan+8ajI3Sa8mJnyt8F/pk5ztsEnJwoVKGj4y28eWfDs5bISGgH0sax+wbo1LHSAmR2y6NvtKcjeLuyWHRc5Z6LsZfiKusNnRvYPjefsh76T890NYmIQISHFVK5vDjuZrgx18Aa0Udd5pQB7fEqEkJezOLp7bNB25PqD8A8uSzTICrlpPxEAP1sXxtXLz1BUr5QXgVn5h+6jTiyPihqmjGMXhlNUpYUqd6VLBRvc+1xdd4+YnQueuW1hkiYx3q8tTF+SmVnjm7xsVJlWDjmTYhkSoutsT/LiPaRn114qcVvg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd17ac21-375e-4f6a-3fb9-08d9d102a67e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:52:36.4942 (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: AM6PR03MB4294 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/amr: Don't reset AVFormatContext.priv_data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: u4xVcwBSNb7w |
Series |
[FFmpeg-devel] avformat/Makefile: Add missing libamqp->urldecode dependency
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
yinshiyou/make_loongarch64 | fail | Make failed |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
diff --git a/libavformat/amr.c b/libavformat/amr.c index 9250089cb1..8e14052200 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -53,8 +53,6 @@ static int amr_write_header(AVFormatContext *s) AVIOContext *pb = s->pb; AVCodecParameters *par = s->streams[0]->codecpar; - s->priv_data = NULL; - if (par->codec_id == AV_CODEC_ID_AMR_NB) { avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */ } else if (par->codec_id == AV_CODEC_ID_AMR_WB) {
The AMR muxer doesn't have a private context, so it's priv_data will be NULL. If it weren't, simply setting it to NULL would lead to a memleak. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavformat/amr.c | 2 -- 1 file changed, 2 deletions(-)