From patchwork Mon Jul 18 17:34:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36823 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1250637pzb; Mon, 18 Jul 2022 10:34:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tNWWSKzaTexEcvsodTSDVZW2uDAaMHUay3ZexxHjoUJoqep7ddtPLH3e0pKFV6IpXWTKwF X-Received: by 2002:a05:6402:240a:b0:437:d2b6:3dde with SMTP id t10-20020a056402240a00b00437d2b63ddemr38305812eda.62.1658165679653; Mon, 18 Jul 2022 10:34:39 -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 cr16-20020a170906d55000b0072b8cd4ca77si3953334ejc.274.2022.07.18.10.34.39; Mon, 18 Jul 2022 10:34:39 -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=Td3z6nu3; 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 4DB1C68B8F7; Mon, 18 Jul 2022 20:34:37 +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-db8eur05olkn2107.outbound.protection.outlook.com [40.92.89.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEAED68B7E0 for ; Mon, 18 Jul 2022 20:34:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PGJlnEwQ4fdvRvx1ickRTMge3MeuFK+O9vlCaLI5iy6La2hE7yPhaMePUXRvI77oXT2H6LYSt5WGKMH3allVKBk3srawI2ZvJZI1LLgNyd8xrqBF4Iw1R8+0uGW5+Lv8tv25o/X/EcRYopTOHpJaj2llLg1OjLOBi8Ejot2RPUg1Xdn9rkDq7IRIWQhr/hKsnsNdF/TfiXBgF74PRZQckTEBIOL2P/DvrCA79vlPsmzw/9TAHokwHZzBnw9NKO2IxXSxW/Cfk9UIlVRsCQexK2Z9rsiBz9N1EgLnw1qcexCS0QqYGA5En9kL5L+sVhyfIam9A1LPf1VwY8bWcmGICw== 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=d3T0r4QznZ7kIBJKc7GoK0/JQ1zIz43nuY2wFgsWZMU=; b=CVqx5Fx+wAfVlBgzlNgd/cnfp80DYTEN1OVw2XLn7EitOvuLb7pBKoUh8vnt7eN12kfsP+JVwToKRJm9pHZGfy6VXMueWdrehZMh41YDaUqikBxtVYF+4DC30lCFzcpl3W3cK2rg9cnm6d7LIQrrLHd/n/EoOCYWLX5jO4dGR6rI8XRfHAKTKfdQJrjNUAFiHNkIHcNSqbmBMKw0dCgx4fKOngv1s2GukWuaXI4lxmR0CgVbspAvZwXirHV0mSdCpiR1I2pjjGTXi9js7ZmC5774AwInGvPPmuP96ZoUHfFqjvbkjNEive2vl4rP2mGdStzZ+mA72aIBQFStlfr1SQ== 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=d3T0r4QznZ7kIBJKc7GoK0/JQ1zIz43nuY2wFgsWZMU=; b=Td3z6nu3YoipylvoIc+7gpZo9bTFX3BWRMO9YkHuKNjdJ6yKStgLErX9sj0Q/DQsuOrBx6c231Hnkpi7JkzycSLPmhtklxGJIJ2QXpFKUEoY+OgaF7lIWq311PeytykRZMtrN+1OLeCPTS/odaJIzmA2Rujo5WVDNGcsQVNpHyc9iyplCUlCZSCA1A61FQhYmvFAqAJj22BFcQBxkHLmV1zYSQCrLY+sVLjWVgDwNwNeRth+/tcx9WRH5RzoixX2pDxqt3wC0UId68um9Y0Gglq9eR/XVbFqVerhjoPxo9CRxVucImS5J2PfqyDNqwl3p0ZL61ES+tN9UQJOYKOkag== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB8PR01MB6261.eurprd01.prod.exchangelabs.com (2603:10a6:10:159::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.20; Mon, 18 Jul 2022 17:34:29 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5438.023; Mon, 18 Jul 2022 17:34:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Jul 2022 19:34:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [gyMor5PLMPzYmdyU5yemoUf9HOV9ItZm] X-ClientProxiedBy: ZR0P278CA0043.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220718173421.529823-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1d9c510-c0ff-4803-a962-08da68e3c4b6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTjlnvVMxpJ5OElGJo/18+x1seSZE0k3lvX++33tBX22wXJuSxNyTAlUKvmU0tuzyhbvaeWWKKiukVWKKu2P8oiCjJpoHEJGLH7P5QZBBeGSWz4tZhzMfMnjGUuW+j2P9WEA98DTj32DA/f59fhH2l1YAibNH7SGM+zbmL+OvYlc1rVoIYsmOw8uP9ObNkW+PQ225sXiUhYLAXIP17vFbvV8DD3debIR64Hx6Pitl11DF0lyJDB8gfGhIFbAwGisCM6pVwqwbo5JtT8spSkZPuo803iAGQjEB9EdsR6pLfsG6lrXYTdy2jPn+b+WTuLLBk5csZbosqQyBFMYhN5SH0AwyPr22cZEZHCfp8w0vylKyWgBkkSnGfaaOtUqfwWk0d8RXqXmAOvwNpb+4cfuCLSehAIU3TOohdSzZXPFCkRNk9HMLXIXfJIhAe76u4MIYZrO+mxOz6m2eHhCw0+v6MS5gElYbLi9KcDEUZHca85EkHtYqML/M4KfjWLPyZw/U1g5rLff/dSKSFcezRGRCpDZruqw59y8dzrq92xB0dC+KanV5Me/evQSCIJAIQN9gYP/IK5WtTO7oyBl823IIKbZelE26w5F8BNfcTG3nEP5g1ud5ATUbnnKw8drOxvT8BIIliJ/EnW9sNoaaI9xzNdz1wJUX/5VSrZ+RzjHljY83+NeK1s4MJ4rLykoCxD35neKgMF8Qm9AtnBorlWf5hs0dY84bJJmQKI7HEhb/kH4rMar4LHJ/0FupydEUC82iU= X-MS-TrafficTypeDiagnostic: DB8PR01MB6261:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kVlDIz+ArX40BEAdj2QqIvE3/B8wWWdUCgt7Ngd1mCMC+bV7svozo1ovqhsP2sc7tXK+bQhf+V1VPOX4PO7TCkLh1vjESwbCm3Bszf7s96DZkJZpiChslUokQeVXuIyndws555ywVElW6dJHppiCubeYVZHwsYcsLhklr6rEIgDzYbTK5mq18idatQF9ZxEmMvg+h1Tc5mDr/x2lSkAXGjGp9TVDJfLb8UTsH45mJZLD8eRueXncJ5GPkHMT04HE6pYytOJfIaEwrquodAT0in2HwbHYPLjZ1d32ezeYN6vb81fuNCkTUcPrabNn99kLcwca7VdBeAQlQlHmglQhTLxKn6iN71gGW3a5veWiTIEc73P8eUHeB6xFeVaaS09shEVRpTPsJpZUKudYcHBLlvmDH+LziCRZwIk8TLRfMakNVpD7VJ/bP9CES9d9o2bR9ga63rA9DZTXI/03C8qgH14PYvMxiOUmxs/AIFc25YfxOPS9YCqBnubbG1twUHWmAKW6p6tm0lWy8q9/3HPsW4xm+bh8wZchkjE/ITUF24Iwu181KNn0fXLuKKWMOMlYM5t4KfC/kNZWRnJws6qSQ29YSdQbr4nsK+EWrVYPHgzX4SOVAH4Sto0Ya5P/0W5HfVHn6SLDmEd14hIYpmhvOw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: owCM57xLToEoVuRsOxgnbNaokchOh3a4GFySRBqY13AvNtT477FcdqVybOsD2U+XVk52mHtnrVvHlQfmlreUHWqaffqaph/pnvsubw86J+I4IMxNWzUC9Q+DZvCutYVFvZY/gJeoqhLAb8N78NRwl/8gZErEZxTKusia1cSYOWJ9u8e9BijClak7iJpEf1lZyQChaZtTgh7JFr1umE17ibkWSjYl1nwHtvYJSNQh5oRUP1M0ok4w2T3jV5cuBQwglCaTOfrxbo/la6k/kbcFkFvPL/5I0T5wx+qMfjfnN9nnZMY1lEUhht3sajVtqrvEIfSLC+rrvManAtGp0axHZgP2+uEABiqQDqDPP9M6xCfPTnK8jOei50hlJ3Drwmc/5AeqJ2hIX/Y4sRKd9JDreduNSZsCSLhiO0uj9gNUMxR3QX7hMs3j6YL2Plf4sNe4980wDUsNGj8Gw4f/FEbsp1HkxuyzbcP3m8yhNOtK1vvqlqxnolIEiXEaQbwIbNuQzB8ffxZSXnN8wgVfXrP2UKymYLo+TltSMd+3uFZDsP4CIhYLj46Igzgf9mwF1POhqLk7/TNBnYCdHAeLQrTOE+Fa5pzEb9PAEwt2dm/EwBRjGxb+CQERU4FOJSHBi+7+vujsww+bWJsXgW+1fM478//GS8xPeRjjNW+KESTmiVN9Sj+Zh1ucgqjbkEwatDGD8PsdowImw94YIxBTb96Hp/4ciglbQzJUKjBqMV7Gz3npeCcU52DVbSRpxAEenYqBVUXoTegRjmo3P5sqzw61hDJy4w75xUGIkOjtf3pQ7TT33oltb3EZQFOsiBwxsRhWGJProt49FqZcHpe8+wec/u4/S7+OR5yy4so8wYaCm+8lNcAFs4Alct5J8ic37PeZSWmgRU4OPrx1TVgwDXFkAmX3Zr3TI6/MHfO0RJLR9jTxdv742KZETypASweWTeEy8m2uXBO/SgMjRIxkwABHP3MmwP1EZ6e2sDviJXelcI9fJINJXvVwMEa/BctnIVwF6P5wPewJgpwMsRf9qVIiY23GB2+UlDziBbNKeBvjy374XgH4CwEptYva0m9zg+joI90VUXVfVZ7k43uqg9QwQVIPg+y6XZvqZ73QT4xL28kMQVifROb3Dzo9AOmMm+FVez+e4iukrm2cC5XxD0dG8Qx17cVa91ONrYulUb1usC40WDUNcAh1yfdB9QmGF0x3oAnjzG8wVxDDrPn3lUnSbZY/gMUCJfkKcjOckyWUTo2CCvwNKWTveLrthJZG/8kQ9Ry2Q9ejQ/johKM/KO5f3IsLYKvWvsJW5ZAflpwXOxo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1d9c510-c0ff-4803-a962-08da68e3c4b6 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2022 17:34:29.6485 (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: DB8PR01MB6261 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/wrapped_avframe: Don't presume AVPacket to be writable 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: VybX225WDtUX It need not be writable; in fact, it is often not writable even if the packet sent to the decoder was writable, because the generic code calls av_packet_ref() on it. It is never writable if a user drains the decoder after every packet, because in this case the decode callback is called from avcodec_send_packet(). Signed-off-by: Andreas Rheinhardt --- libavcodec/wrapped_avframe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/wrapped_avframe.c b/libavcodec/wrapped_avframe.c index e2f27f91a3..c89cdfd1e8 100644 --- a/libavcodec/wrapped_avframe.c +++ b/libavcodec/wrapped_avframe.c @@ -92,7 +92,9 @@ static int wrapped_avframe_decode(AVCodecContext *avctx, AVFrame *out, in = (AVFrame*)pkt->data; - av_frame_move_ref(out, in); + err = av_frame_ref(out, in); + if (err < 0) + return err; err = ff_decode_frame_props(avctx, out); if (err < 0)