From patchwork Thu Apr 1 21:24:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26692 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 1B6FC4490F7 for ; Fri, 2 Apr 2021 00:24:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E02C66880A8; Fri, 2 Apr 2021 00:24:54 +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-db8eur05olkn2045.outbound.protection.outlook.com [40.92.89.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EC03687F2A for ; Fri, 2 Apr 2021 00:24:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j0VSA0iykORUgtmjEKcd1qXlaZ23FEPHNyX6wyNnD2/VyethLtHSc259dQz3Uj8SNQpUWko4ePbGdYH6U1B2Yrpuy6YA/RiRtto34vXi16/bBGcbsNQwh7qHEyqUU6hpPZNmcoTdPXbdOnQBtmVgWBv6pmDya+gAlmn1vvhsAbssefuHF060Yeb7IfRduOC+a7dqkQXacn0hhRKZUJxmRPxDzFS12Kudy8tMbUFcgjlsKmuH/Qm4jv/9yquW/01J4EiHN09md+ED1D3hT9lO2tD3ntk8043jonIKs+tHbAIOIYx2lwVK5cTxmBiNU7jUykW19l7yHLBq/JorhY289Q== 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=W5dFr0ys3w2hRlr335muj2/KcQj59LXpl3RAQq9YSa4=; b=Um5zoQxFix5SAcYM7JBv2EYPOovTSt+cNQF3Um2kAkbM/8eSuy6x3kLI1tPvVWVgfev5M5pYXeqrk5Rqnqa7arXRWrPfezycJ4taiTsRfEgTJ/xwxDO/ltZISaZ1k0Mo5SiVLWFtas+h/gUm5tpnQ0BdzjRrOc3EW1ygwzS9TiFAJRJ8ya1eTq5udS40gDL4JCsYuD8fMiIz+KCrCOljtNM2CWccERmp5k5I2AjR7gUxanJ3NmX8AEyPjppXbRucnhpyKQo1XLs9x7obq0piVA7OHl20gVJ1hWoGhWR7vuuRLVdL6ocmxxj+c/eABi2QTKwvcTdEdLVdnHTqcqYQZw== 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=W5dFr0ys3w2hRlr335muj2/KcQj59LXpl3RAQq9YSa4=; b=AuHUjDwXc7OiWRJbI8gRUKIoKsfA0DDJGHuHXuau2fOjJK/2jKfM6Vuwg50aZXOm/kLiXW+pBR6C5KR3i49oLt96b8i59jRs2jBX/8/Gc0bZdyGWTN63uwNQTkMv4NnOueoji9Q9yNsFS4AZSrar7R36xwhKtKsEqI/H9awjQ45hvBqIMMtWRlnKLmmgTrK3peCo4XbnCE1kQBsPvws6NNFgDSFSns5ioAhU4ALe6l4GX8BZEYi/cAgw/oB9YbSQdl4upMyBdcFMB38lPeLBe3FkJA+Bb10ZZjFHnifkjOXW73KMMjJsI+GcBxroDTl/yU2haqD1W8HS0x4++dxOOg== Received: from DB8EUR05FT053.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::44) by DB8EUR05HT077.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::287) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Thu, 1 Apr 2021 21:24:45 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::51) by DB8EUR05FT053.mail.protection.outlook.com (2a01:111:e400:fc0f::98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:24:45 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:BB16385D6DB9561D625470B1B43EF96C3339E3DA72A64555C761FD3F8E55786F; UpperCasedChecksum:CF0270EFD727524F350DB0C5175BCB44218AC1B54A35A4020D1ACE328BE3BB09; SizeAsReceived:7391; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.028; Thu, 1 Apr 2021 21:24:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 23:24:21 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [v6L2JJW9gMSNh5L3GAv67mr+JgGI/KIo] X-ClientProxiedBy: AM0PR02CA0130.eurprd02.prod.outlook.com (2603:10a6:20b:28c::27) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210401212427.2291762-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR02CA0130.eurprd02.prod.outlook.com (2603:10a6:20b:28c::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:24:44 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: bd378b4f-f352-4424-67d4-08d8f55491f7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXIGlc7gHXb8Sy31K73vdRquc7H1zSbIAIwiDTxOeCkpCtxm4f0XUl9XeHAKhkB0A9He1Vp6sOBCbyLwQBr3qMY21QYilZvpImTfUi5W7zwd/6KYV00LhZUkiWTzOtoeW/cogPxPP9I3KiWAkLRjH5ODf/WxuF3Kb9huXyb3AxaeXKzVdi0W6U4uqNqhW3NUT3Jl7iM5mcv13ZWeY2CiCdX7No8dpjiIJorXVgMDrEglw5lDWasetRv6PSfDRBCnVWIHNUogTamk0673C3Nw7QjE0stjA90/0L+ubhxjVcIl/rs28CwsV3JkoYxAWVDYksqgJQS4SRq3sEj1OlfyLXRVsvZf63/RySgvmvgmCNNr4Vd5iwQFCspeKoemIkEqzfZcxWJxwcxa9W2ID0rtH72nnZrExP5TcJrhvtkWIyY+O1ql9LtmC8Sa9sl82tluxCvi/SxRSIAkyFKS41BhTtbj3ovW9YdYgpXhSnxGr+XqSmtdt8MA+4oZLVmLCeaMRED2SfxCv8zQX5zud4WF4R3Ikt4O5J1+VUFfcUpLi/ZU7XbR02iE8Y9tUp/OpInSArY2SyDSEJsTopYyXKmxM0ixWxEVygdJEFDoIr/dY49WkMQDARgxShFupxxPk1n7U/mtunaSrFa/I2kFpa+/SMG3UO/CFmi9A6WgGEkwEmDwyZ7xX0BaIibYjSIOmfY7EZdFN3hzj6h6zYHRnDbh6jBVCIbzOscYBc= X-MS-TrafficTypeDiagnostic: DB8EUR05HT077: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hKvdvkZX7D6UqO6xG6Vt97uFKgankjEk4CDoO8OrA6NMXgu/ZT3bJNXF7ef4oHP/uE27rCzijZeMXA19ITWsS9d6uerlhNIf3p7rB8xTq/qJu+2qK9QYaBunbyEIXLWQY3uHLDGdJ7HUvc7giy1bdoQ1sfU4KwuOZoCVIqqLh2IppBkmKOFfNB1HO1kPcANPLDsaYVY9c1akdBBGrrD4umIB08v2GFSQYPIK66KcEqePRAnSeLC1SYljdkz9iL6jP2sn13DArVJumQcj1iIGbgnp3oKOXQBQOM4CvNNdqOWJLgVs7Fn3Tcnd1CC5fph5wX4RqLE8AWSk2jSibqQB3jzkat0+9zGcBROC8MbTSTDxH4gvXKXJpSUcaWqOuE+cTCHlbTkaqEhaEh2/r9xyBw== X-MS-Exchange-AntiSpam-MessageData: KnisIAj6hQajoiV++s1qlsYi+U5xtukKGPuQ+4CC78POTuHEpLWcxerCLmEo1Kd1A997T+1YfS8v9El63qlYWoGWEQkDIMjz0b8yXDiT7B64BV3Wg+qNWenOrvNhH7oXVUtAmZoM7n2cMSWlvLtioQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd378b4f-f352-4424-67d4-08d8f55491f7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 21:24:45.1211 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT053.eop-eur05.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: DB8EUR05HT077 Subject: [FFmpeg-devel] [PATCH 1/7] avformat/utils: Check allocations for failure 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There would be leaks in case of failure. Signed-off-by: Andreas Rheinhardt --- There is unfortunately more of this dynarray_add. libavformat/utils.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 0834c80f4e..13b1bc7c78 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4625,7 +4625,7 @@ fail: AVProgram *av_new_program(AVFormatContext *ac, int id) { AVProgram *program = NULL; - int i; + int i, ret; av_log(ac, AV_LOG_TRACE, "new_program: id=0x%04x\n", id); @@ -4637,7 +4637,11 @@ AVProgram *av_new_program(AVFormatContext *ac, int id) program = av_mallocz(sizeof(AVProgram)); if (!program) return NULL; - dynarray_add(&ac->programs, &ac->nb_programs, program); + ret = av_dynarray_add_nofree(&ac->programs, &ac->nb_programs, program); + if (ret < 0) { + av_free(program); + return NULL; + } program->discard = AVDISCARD_NONE; program->pmt_version = -1; program->id = id; @@ -4657,7 +4661,7 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba int64_t start, int64_t end, const char *title) { AVChapter *chapter = NULL; - int i; + int i, ret; if (end != AV_NOPTS_VALUE && start > end) { av_log(s, AV_LOG_ERROR, "Chapter end time %"PRId64" before start %"PRId64"\n", end, start); @@ -4677,7 +4681,11 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_ba chapter = av_mallocz(sizeof(AVChapter)); if (!chapter) return NULL; - dynarray_add(&s->chapters, &s->nb_chapters, chapter); + ret = av_dynarray_add_nofree(&s->chapters, &s->nb_chapters, chapter); + if (ret < 0) { + av_free(chapter); + return NULL; + } } av_dict_set(&chapter->metadata, "title", title, 0); chapter->id = id; From patchwork Thu Apr 1 21:26:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26694 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 5337844A5B2 for ; Fri, 2 Apr 2021 00:26:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30338689F27; Fri, 2 Apr 2021 00:26:36 +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-db8eur05olkn2051.outbound.protection.outlook.com [40.92.89.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC397680355 for ; Fri, 2 Apr 2021 00:26:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h5tA7WS7F14kkn6JZmLY14U66jcESB7eYu4FwoVEsM4+D06qOmcnZ4nBsl/PUHLEO6hxeabUAn+XjqCBvpEQiBMy6SIRlyuiMVBb2XQxUFGYHsBokuTkASBqvWYXv/lS8IKzDUr74mYpGrXxFz0pLHRdzSYxHaqTwASKjI5M2kj12Zymjf+KRgT2KCdiSKIV3MimLfYQrn2DTjYstXJb+QWOldOQwu5a8djl9GYSPx5WJZZP41yfXbFb3gBZokuRdmXameO5mIDNw6FBDdZpiES18+hoOwRMm3BkB2dbZZfnLiakoWZLGOlYF2TrqsPALb36U1dA7efp1oXKXvmqWA== 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=9CJjW0f7/YSHTUTAEJadza78zv81nbWT14s5CNmXICw=; b=eU6vo+Sna0Loxng9l7IIqaE77eJEHwgf17nLRxCdbgwkI44Vz99eOWKn3dgj+NnZfVX+7P4H79ZoRv9j1e8YJMuHU+6Yf5rYRTmdjyZ2KwhDRGGUCLvBgs9gtia3Mj8qUovpS2eY3Q4URUZY778ePTqsyrJtNdM/wdCpwbOozmwO4S/NbFhhp5sqW2/q7tDVNaPVV3jKvIuMh5tMAtyb+fOHLn4XWiA+CJpP1d4X5AJzvqorKd3cry4L5k5F7+snyWR5wCTq0jNcFWYZePyMBQKdhRb2Hupfr3Wy4CEdhs1JOYbAr4/CDGiJ4bnd1jj2saUvcWWg7lqOcqRGyYUrPg== 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=9CJjW0f7/YSHTUTAEJadza78zv81nbWT14s5CNmXICw=; b=ZGNsvje4tKI/uJ38IqHw3I35Bulgu9MUAncYQLdllAwWeKqmRcNwDu3DbhTQN954xqWNlj3sEv0BhkkpPF6FiTgBenheuPJZ/Sf8kw7iKxxFyclNRgtl5eoCDqS79EfT7jZef/MohN/5B9b0jOL0r2B68FyaoOTPz2CYhhyFAfF8Rn6gqYyddkS8VSdJ908Z+qq4gT16DktYkpsOYBO5s0Xg+FLM7qLXzIW3eeJVf5rAu/Kcj/d+kGsvy/+K7/DAK06lvcHllvmV5/gHK1Xfkq4w43+MbtZf6s0naSCKCXUOn/6ACT4nkmDeuuOd6Q2A3biq2K/a09Nk/piJIh9GCw== Received: from DB8EUR05FT053.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::47) by DB8EUR05HT109.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Thu, 1 Apr 2021 21:26:20 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::51) by DB8EUR05FT053.mail.protection.outlook.com (2a01:111:e400:fc0f::98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:26:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:BD52B77D7B014BD4A9DE6F3675A09C687F80C5A4B6287CCE866086455701358A; UpperCasedChecksum:F6E0CD18C7617DAE966640E824616FF5848E705753ED9FD442D28B448A8D3DE4; SizeAsReceived:7597; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.028; Thu, 1 Apr 2021 21:26:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 23:26:07 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [fJHNTJKwm5tqbOpCayaXXNz6zcDW7/SZ] X-ClientProxiedBy: AM0PR10CA0016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::26) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210401212612.2343423-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR10CA0016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:26:20 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 88669029-b8a6-42d3-53cc-08d8f554cae5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRmQk3JzeNKq1p0dsiv88hW8SgJv5RQEDp1LGf/3205FT9c0sKbb51WOzVhnipYx2cQ/9a6yjksh70UDH110L9I96XbzPRvdZ5m1JAG/SmEpgDR0KIu20VGOwvg+IMRxXYQSGC0HnvQdQFYqGa9y9Sp3I2xQDsz6YffaO4ae7s8Vq1z8K9rYAGTf4lsZr6UVIbBjnVp9UaFvSr5XoV9TQQamC5AXwT9BYMOQEZE1NYNHnFOnOc24R2YpjwCV9iRcUYk0BDnPNrlRTm2jzbkly2DsClSK6fWuHZTbcNDmKI0FUwZODY4fMdIrCXFUA+ZncNotxltOr1QrlVCNx64otX0Nfq9ML0PWoUuuZEGbRGEugrdVV23am6mHwzPbcY7sLR4GnBThDP0Ny6GClbPlez2xb3K8Wp59TlGx3UD5Uol8snAiIGLnybN/z4hvI0W0bQlX63AcKnnh0xLeNHoX8rngTlLmknPay1ygknDlZpQl4VrrEBbNKPHwsfqzNAtgFI7jrOD0kH7pwBOI3CgNhsSAFHw5/vJZ1fOHMjTm5C2okFMFXf0a65qot+llglbbN27dVyg8tu57xjFbhRYEVpzCK7xDol2cjcRveHvvE0U+lnBp91RCWLZVFDlPCmUiB5Vzf1yFLiFzeLWB6FUjz0I4wjG9yzfosO9DBcJd/8Kq/nm5sZupLXjj8RX4kUl7kTA2rSXPfoUrZ4+mWJQ/BtvJAcQclSOqsHEHTvltIN2XECwAhhcrQ9UBs85rJHMU/A= X-MS-TrafficTypeDiagnostic: DB8EUR05HT109: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Nm/2w55WV3PxpwIi66e/36LTNdPx7DPGznkih3v5sDLFvw0QnMk822QmVBMktyY4pbJV8ph90ZkAfurnQaYzLiNKGGV9foO0dcGSNxyEEEwl4qRgsJJewr34gT3SpkgpOdVwvUAlc9eh+pEa4nQlJqnuz2HfiKRYJSxmJ4MHoQrY4+sFuQoUoh31mZ0mFT88sQ/zsLRukn3Or4f8HMRotI/cfZIXjQcH8sNISD9Mhhk6BJ9ckb7GY0Wlj4sZ7ePLoMKQK5xlUXB4EkvvKkYqtZYNdYCM8TStJujKfqNP5J5J5anGXHusp/APjWDc/1ynUcBPx0Z6vlP6DFGK4DqCPlzQzyXH73hDLYsgXOuFE17H7v+kYh0uJZzVw7Tn6083WpJyfGwgW7r0WDhxpSzMVg== X-MS-Exchange-AntiSpam-MessageData: b+koff1muSVLZ893gkf0t4Wx/3YQCIVE8XXB9t6A/Wy2OVpR/oe84bTNxCgNCNZpnilOljpTF/nx59eWjdmTnRScRKz1Zs6NRyNkBu4GL4MpqUWwh9QiVQnoLyQrTCbpkzU+OHM67E3/0efDxov/cw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88669029-b8a6-42d3-53cc-08d8f554cae5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 21:26:20.4709 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT053.eop-eur05.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: DB8EUR05HT109 Subject: [FFmpeg-devel] [PATCH 2/7] avformat/dss: Don't prematurely modify context variable 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The DSS demuxer currently decrements a counter that should be positive at the beginning of read_packet; should it become negative, it means that the data to be read can't be read contiguosly, but has to be read in two parts. In this case the counter is incremented again after the first read if said read succeeded; if not, the counter stays negative. This can lead to problems in further read_packet calls; in tickets #9020 and #9023 it led to segfaults if one tries to seek lateron if the seek failed and generic seek tried to read from the beginning. But it could also happen when av_new_packet() failed and the user attempted to read again afterwards. Signed-off-by: Andreas Rheinhardt --- libavformat/dss.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/libavformat/dss.c b/libavformat/dss.c index 0585049130..468de3fe84 100644 --- a/libavformat/dss.c +++ b/libavformat/dss.c @@ -219,7 +219,6 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) } else read_size = DSS_FRAME_SIZE; - ctx->counter -= read_size; ctx->packet_size = DSS_FRAME_SIZE - 1; ret = av_new_packet(pkt, DSS_FRAME_SIZE); @@ -231,17 +230,16 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = 0; s->bit_rate = 8LL * ctx->packet_size * st->codecpar->sample_rate * 512 / (506 * pkt->duration); - if (ctx->counter < 0) { - int size2 = ctx->counter + read_size; - - ret = avio_read(s->pb, ctx->dss_sp_buf + offset + buff_offset, - size2 - offset); - if (ret < size2 - offset) + if (ctx->counter < read_size) { + ret = avio_read(s->pb, ctx->dss_sp_buf + buff_offset, + ctx->counter); + if (ret < ctx->counter) goto error_eof; + offset = ctx->counter; dss_skip_audio_header(s, pkt); - offset = size2; } + ctx->counter -= read_size; ret = avio_read(s->pb, ctx->dss_sp_buf + offset + buff_offset, read_size - offset); @@ -278,7 +276,7 @@ static int dss_723_1_read_packet(AVFormatContext *s, AVPacket *pkt) size = frame_size[byte & 3]; ctx->packet_size = size; - ctx->counter -= size; + ctx->counter--; ret = av_new_packet(pkt, size); if (ret < 0) @@ -288,27 +286,26 @@ static int dss_723_1_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->data[0] = byte; offset = 1; pkt->duration = 240; - s->bit_rate = 8LL * size * st->codecpar->sample_rate * 512 / (506 * pkt->duration); + s->bit_rate = 8LL * size-- * st->codecpar->sample_rate * 512 / (506 * pkt->duration); pkt->stream_index = 0; - if (ctx->counter < 0) { - int size2 = ctx->counter + size; - + if (ctx->counter < size) { ret = avio_read(s->pb, pkt->data + offset, - size2 - offset); - if (ret < size2 - offset) { + ctx->counter); + if (ret < ctx->counter) return ret < 0 ? ret : AVERROR_EOF; - } + offset += ctx->counter; + size -= ctx->counter; + ctx->counter = 0; dss_skip_audio_header(s, pkt); - offset = size2; } + ctx->counter -= size; - ret = avio_read(s->pb, pkt->data + offset, size - offset); - if (ret < size - offset) { + ret = avio_read(s->pb, pkt->data + offset, size); + if (ret < size) return ret < 0 ? ret : AVERROR_EOF; - } return pkt->size; } From patchwork Thu Apr 1 21:26:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26695 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 3E08E44A5B2 for ; Fri, 2 Apr 2021 00:26:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2854D68A2B1; Fri, 2 Apr 2021 00:26:52 +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-db8eur05olkn2061.outbound.protection.outlook.com [40.92.89.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFCC568A2B1 for ; Fri, 2 Apr 2021 00:26:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SVbxKKeLaDQ7SKpYL+9bRz3d6wDtK+uD7RzM+gD3jaLUpZsUehx2U9BWkXiU4e00G2fy0pB/cZKv2px2Jx4mrCKDk43JUVotM1c9rmIlXx5i3qRkhuvppRHeB+IeVTBszrvu+zSNMTOdTk4h4M+In5yO6Ehbn3zESDndZLJ9LbL0rftsdPS+LPgM1xRJ9dVvWqVMhN3HExWYK1hQOg4HtSRj7y8JBZf+o00jKEO0FYBbaJ6rlRH6q1yatqYeIsnsm90diMi21Tmab3ls9r+68Fpm2qKiHZ7CCbb7d3L1i5sLPY2C74xsFMysqIBDyC8VacRkSy0EC6c7wX3UR1WmRA== 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=08aFqB6BAh7qZJSpF1TuLwgxRwNO8laIHOCbEWd3NHY=; b=U8yladeu7xBCZv2r0WetRz+gm9IsqxGl6NtoVCkw8vWQj1np4mAF046DUWrZyjZTLIDpyhZysj0YYRbTbJu1clt5mGHf3vG+G7/BqQhFU3WRXjPpCZVw/YKcMWqlJBlFrrmd3MQ7w1G9hCadU6+d5qFRBeP5y2e2zkM3j51OCu6c5Pvg2dEdKdtDBhp5juc6cn/JPIe56cGLfpJ75Cm46xnuT5BXzKIQ+7V9FUW6Ze4fSlx0EuN2dlgwE+hG6HGDTVDl262o3wMMQj8t7b7D+H0IXIpx4UNfRqgF/8mrldbDkCdTWyhDn3Fcy+yhAJPBKN7FHBY0KPcv5HjQc6L4ig== 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=08aFqB6BAh7qZJSpF1TuLwgxRwNO8laIHOCbEWd3NHY=; b=cGxWgmNQ22ofbNW246BNntTh2kjb5ocRipFP9/ozg/w4fvOzMXVMcINM4WaHk23c2nytKjfkfJLNaW1MOU3krJw+Ub0fAf2kmhhg+Z2ZySVw3rrl2xvZ9RVwPsbtttg44W3dwhtdbZQkJmcGregP/63EKJ0AOMpmVmHdbNvYJl122Tur04NUjOx/EpWgod8HUMbnuzuHkLjlQEb/ZaUJwXEjeT71qmj5dato6bra92nweYxkn7sZJRBKeViWHCch6avQmuKvf1fwdy6Rs5vVtZiDG0xyqA37E20BrwbNX1JIrSRNeOQtBqtwJGWpGSFDPUOcUV34YckZO8Sn8Bn9MQ== Received: from DB8EUR05FT053.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4b) by DB8EUR05HT120.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::466) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Thu, 1 Apr 2021 21:26:42 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::51) by DB8EUR05FT053.mail.protection.outlook.com (2a01:111:e400:fc0f::98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:26:42 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B07FC3EB3E1058F9C1A92C90ABE9B9EC6CADD7F3FADE96DCBDBD4A2DE8B7ADB2; UpperCasedChecksum:0583F52EDFAF7AB913B0509D63D56111480059ACFB666EBD4091215B4122F7E2; SizeAsReceived:7597; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.028; Thu, 1 Apr 2021 21:26:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 23:26:08 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [8EPRrWG8hc8xKBxoR4QQXJ2aJPP3eI5s] X-ClientProxiedBy: AM0PR10CA0016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::26) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210401212612.2343423-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR10CA0016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:26:42 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 363485ef-4cde-4ff8-12c1-08d8f554d825 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKNJu80vzaGCFsmWhGxAbOXJFCuOy1RE4M6qDrJsQLxK5zRxgVkLU7rYYwvrHzjKZcLSFTXSxrLQ43mFdED82khnNu6GMfUv7wvhGD9y7NDsYHcYsx8Oup92bJEtrIDzMBrPx70EJWve84zeQAaFo2Ew1A1d0qb1RY21jlylUYXJo7lFcUWiXVidl1GTLCdm8HFWcYV6DBg9VJE/vVIGfOZAwuDSuCaXrIuQSTx9J4lmUV/1rq6oSKJ/KUXZDhsHVkdQ+GjQHf/fWCAB7o05fWcb6DgXfYqA22R1E88GZPWl01WnKEhLoEErIWbPVodgi7ZsqDdvSiWJjJ0Q0W4oxP82THKVpvoAHWxHxTwDPh6V8m8N/Vb+2R90j45v93fY/seDzbQn+pdvJQ7Q9lgawBFGER1z3XVmSNn94LrxJZnuSL3TkHtQKkcl+cfMDOJbYp40BYjwlnfscrFKYqm8t/ZFuesRWIZrdsJehvOrbdPdxZqIdPdJ21cXYpStE8CvYb60YlDPiZybrQvfSTFZJyaskZi27P2hw9lpBswAOMhoyp1UHVHu7G9NMG3hKi2e/g9dn0evIb/G0oI/Xjyh5oycQrh107vGzYMnwB7MEQNyPsE18JLcziY5WjZ51YJcTY+zvgZbbpJ3yaGmghPyA50ryIIT64kgVY9t+yDDMXk5VlnCh1PFFo1k+ObHel0EGjACAVwj952Sw== X-MS-TrafficTypeDiagnostic: DB8EUR05HT120: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BTnv+adFFDLUTf4ZmPhO/WadAwt7c7xEtR5v8u9PC11cM0LeE8L9LSEAvV5NwJP447gHmScZR+gLIWFf7z94jrLd+Pc7FHlMCUZabaLLdZau200qeam3bji9dwRxCAc3XcAzRF5muLsj3ichL3ihkT85y7ywoHXRTYFbJRl7XlYtNfB7jNUHtKeNWRgKehTjaVeV2Xn5yqIOjyRP2ePDfoa1drZ3gZr36HEjYywaX680C9iUDi1GwTMbqloh8uS2T9KEvjZelXYTdG0f58eyBQrxI2Ypx/h8UlGjUJIR+O+iVYMYHXZjCx8gGzaSxQ22iePiMc7D5Z+/URulEatHNqUYY0hI6TBDW4qLjhrq5CKSa1nGlLO8o183pYe32g7ZnV1P+uSTopVO9EpdGID8Ow== X-MS-Exchange-AntiSpam-MessageData: zd2pZ10TMLM4JSwjSBRbBzTdJ3CwDU3Us+F9SbioMkkzdHkgGT8Ul7/g1faPUIqMmkSYSDHGlJPk6S5NnBY4/1Lm0uVwjSPZeFPN1thskuG5jDyJpbin9XiQnL7Qz68ThlC0iLO+KgBkVrEhjpbPcA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 363485ef-4cde-4ff8-12c1-08d8f554d825 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 21:26:42.7000 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT053.eop-eur05.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: DB8EUR05HT120 Subject: [FFmpeg-devel] [PATCH 3/7] avformat/dss: Set values known during read_header in read_header 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/dss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/dss.c b/libavformat/dss.c index 468de3fe84..0b6d68af99 100644 --- a/libavformat/dss.c +++ b/libavformat/dss.c @@ -144,6 +144,8 @@ static int dss_read_header(AVFormatContext *s) if (ctx->audio_codec == DSS_ACODEC_DSS_SP) { st->codecpar->codec_id = AV_CODEC_ID_DSS_SP; st->codecpar->sample_rate = 11025; + s->bit_rate = 8 * (DSS_FRAME_SIZE - 1) * st->codecpar->sample_rate + * 512 / (506 * 264); } else if (ctx->audio_codec == DSS_ACODEC_G723_1) { st->codecpar->codec_id = AV_CODEC_ID_G723_1; st->codecpar->sample_rate = 8000; @@ -206,7 +208,6 @@ static void dss_sp_byte_swap(DSSDemuxContext *ctx, static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) { DSSDemuxContext *ctx = s->priv_data; - AVStream *st = s->streams[0]; int read_size, ret, offset = 0, buff_offset = 0; int64_t pos = avio_tell(s->pb); @@ -219,8 +220,6 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) } else read_size = DSS_FRAME_SIZE; - ctx->packet_size = DSS_FRAME_SIZE - 1; - ret = av_new_packet(pkt, DSS_FRAME_SIZE); if (ret < 0) return ret; @@ -228,7 +227,6 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->duration = 264; pkt->pos = pos; pkt->stream_index = 0; - s->bit_rate = 8LL * ctx->packet_size * st->codecpar->sample_rate * 512 / (506 * pkt->duration); if (ctx->counter < read_size) { ret = avio_read(s->pb, ctx->dss_sp_buf + buff_offset, From patchwork Thu Apr 1 21:26:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26696 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 2D18B44A5B2 for ; Fri, 2 Apr 2021 00:26:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A6DB68836F; Fri, 2 Apr 2021 00:26:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2031.outbound.protection.outlook.com [40.92.90.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4934A68836F for ; Fri, 2 Apr 2021 00:26:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WMLS+F9KRcPiSpAnyTLA5s8jGiK2dD+nXAdPtGc0lT6A8TEt9sXYkCpMBOsTxU3G5ZwlxoCMV6uwOXTTrpXyCgLuy4LFy+FZf//LF/nEV+EJYpj1JZAjb1okKkgUirZEPt+kQJ49+SbBQO1AA2oay3t4D/VRScxoAES/YdeLol2+JSrEdCY624uxXEbbdPafiXwX2cru9Fw9uGSsehs0cn4ksU44yI9p0BAYcWowKi1V67xS6z+QaPhU6hXujVhYO+02mkCC6HPD0dRMhRif/xCBL39BmCiIdPM5ru+jZP/oeeQhMVbusu9QNZK+9LcqGaqt/dkad2fcUSSKjCdtzw== 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=vtkkBGTFwCRvA83OkQMSD4dI7IaHaTREfksaoVZ2EwQ=; b=kIiOsocMI+SZF6KU+5umuuh4K4HW2K4ARmRWNJJbkIPIufSCbX8hEkBRspUWxp+lSgnB2k14uSnSJ3bpu1bYt5xc4UT8OxAJCS/EKVQoYB+8LcJ1ysEavSeIhBu7whX1zTqfAUa0Gfje5AB7tfEqa1/9Lj3tLxV8IlHeLQst22MwdpW/mL90OsQaIlvlPH6L9antyKPUFP9NQL2ND4Kqo/1nbnHZUFKSHEWOWuvf7+kgSn7S7/2BTb91W5/21T/B2ecIU8/y6sRxFAEw/W3bqyiGZJtG8wUQfAL42azyaeNgTNfz5Fdp7jfPPMhq/G68q/KGpO40ZBeYK9jXlOxgdw== 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=vtkkBGTFwCRvA83OkQMSD4dI7IaHaTREfksaoVZ2EwQ=; b=e1X57Crh32Yupg1xImB8VS7HBzZM8wfhdw9/r3HQCWEZyhWXtl7+oIL7LIgut/KI22qZU6NjhqUy5OEdIdluqWKd65ltwMfrH44cBSi1j++wbRxc8k2U/gtmX+8ih+b8MUEI//Hqr9dR5jbHWsT5xSroUx/7hgETIF4F2DrsW8YPtbuUfeTp3j+maSs0Wo95enHcKDPW4fqcLBTbWWU9dWkkYYTY5rgfH4UMS9eRluK0PYbsURb/g69CllDhCdHR3wHEZYc5XoCAkRiGuMZOwX8ehMqdlkdiOFu9IdE0cecFodiHhOTN6FQLL4pH0LoIMyNftZ3ZcurV3RJXvMXT6Q== Received: from DB8EUR05FT053.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::41) by DB8EUR05HT070.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Thu, 1 Apr 2021 21:26:44 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::51) by DB8EUR05FT053.mail.protection.outlook.com (2a01:111:e400:fc0f::98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:26:44 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D5EFF5EB58537E134B04FF3B1A1663C4DC9CAEE71D276FFA86B821C8C29B9EA4; UpperCasedChecksum:75BE971C0FDFA0105EC2602BBE25FD9F52A389F72338C682519070090EF8261E; SizeAsReceived:7578; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.028; Thu, 1 Apr 2021 21:26:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 23:26:09 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [o2FjL2od4xMjagz7Wg+hQGoFQ2vRpjva] X-ClientProxiedBy: AM0PR10CA0016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::26) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210401212612.2343423-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR10CA0016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:26:43 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 30c14bc3-90db-4726-f043-08d8f554d908 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXIGlc7gHXb8Sy31K73vdRqpC+CEvkxLYCqLTw8TC3KmdGBBMIv5gvx+uvql40rJh8/C0bFQhKIsNLOgeS3+wbNQGTZmtKJozy6/xUT993ewCVasgqwImrjnTj/8raoHsAYYotdbt4psv/LLYkhvnPmTVV+i5BQiFAY9zucFdHxjiTnAed6xiQB7KOGQ1hftATEkXv426Rwm9zDc1Dx+/qsGcbWX4wEY87pphuOa3muS2fKbWNkKmrnTA0q0gHl6StXSQq6CruruRpDUm+oT5McfytdidDNlXhzOiW46cpljWOjwvTeXDNw9APNg6/JVG6Hq9u2/Uu1KwJSU9J4HyxUolPJt+Bi7teoVEQy9NxZMY9onKCTCGq1Rp6mfQZYauwh2hH3O/o3cXYygFTex81Rc+hj0tz/KQ6XpKf1EivF0ZWHA3Tu8IhsnvB06cpIFJxmsAH1JrSq5LMVNeIbq/UqmPMd0oW6lqMVlaBRdCl2JfXE4v3QEThimt2OcDf/FR589uZ2PAOoosRQZLYef82PZ+UWyQ1JFGSIe55SWet6hX1RWEF8r25uoJ1ee4gOTPlODWFAfzNsOQCQogXhNddrGS0tTvXK5uObFO67qOs38Q91iRQJZRpAgZGIG7TBHyaFObvT2epqMgSAtZbRYdHVz6rEpoKASEmvR773TTGzJVtDfKk3tJ79eoHtARwRxr8mtwDWbw7FL08jfy9IDZX5Qj7K7xETxww= X-MS-TrafficTypeDiagnostic: DB8EUR05HT070: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5qI+F2L00D03JFlH9vKql0DgVYSn+u9UTJfzIWaJ940hI8dxC+aF5QUIMLt09xSb6coskX9e0ACHe93FMZXazdkBOnQBKV2DBGnDh2A+htWVl57yc1t/AqT9lOIejTizIln9fPZOiKtX2YF9D3Ua5ytlsgYGKy1VplToLplRZC29CpPauUVgnZ+jKNSHBSMGdrC+zGUkkNwvvAuXrbey81kcoJl9I5++Rtlsw+JRzdhc98mwm1JAYYfGePonsr8AgzA1T4k47aG3YM0jcko8lvitlNRR+OvuiBFIg1/Ac2FkweySxBaJHKAUZ7lUTay9spGBcplLwjhxTVqkD353eROwRnz3NbPKIe4+rc9Szhzojf+I8qpv57bLPUdB4c4sXPd5gwTu1q5FP+m2zaH6iQ== X-MS-Exchange-AntiSpam-MessageData: /lAKkftlPVyVxAQO2c49bgS32UUC24fWXa19jK7d775I1KAWbVxpcO7OGrXHeSEVgyqLGISV651mcxLUF7OPdEB7x+gGPlcMp1HPTtscA8HT0MPwLT5JEEL3oGhvaPnMbA45lY2kW0oTcZS85SQTMQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30c14bc3-90db-4726-f043-08d8f554d908 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 21:26:44.1864 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT053.eop-eur05.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: DB8EUR05HT070 Subject: [FFmpeg-devel] [PATCH 4/7] avformat/dss: Avoid using intermediate buffer 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" All one needs is one byte beyond the end of the normal data; and because the packet is padded, one already has it. Signed-off-by: Andreas Rheinhardt --- libavformat/dss.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/libavformat/dss.c b/libavformat/dss.c index 0b6d68af99..f4545326d2 100644 --- a/libavformat/dss.c +++ b/libavformat/dss.c @@ -50,7 +50,6 @@ typedef struct DSSDemuxContext { int counter; int swap; int dss_sp_swap_byte; - int8_t dss_sp_buf[DSS_FRAME_SIZE + 1]; int packet_size; int dss_header_size; @@ -182,26 +181,23 @@ static void dss_skip_audio_header(AVFormatContext *s, AVPacket *pkt) ctx->counter += DSS_BLOCK_SIZE - DSS_AUDIO_BLOCK_HEADER_SIZE; } -static void dss_sp_byte_swap(DSSDemuxContext *ctx, - uint8_t *dst, const uint8_t *src) +static void dss_sp_byte_swap(DSSDemuxContext *ctx, uint8_t *data) { int i; if (ctx->swap) { - for (i = 3; i < DSS_FRAME_SIZE; i += 2) - dst[i] = src[i]; - for (i = 0; i < DSS_FRAME_SIZE - 2; i += 2) - dst[i] = src[i + 4]; + data[i] = data[i + 4]; - dst[1] = ctx->dss_sp_swap_byte; + /* Zero the padding. */ + data[DSS_FRAME_SIZE] = 0; + data[1] = ctx->dss_sp_swap_byte; } else { - memcpy(dst, src, DSS_FRAME_SIZE); - ctx->dss_sp_swap_byte = src[DSS_FRAME_SIZE - 2]; + ctx->dss_sp_swap_byte = data[DSS_FRAME_SIZE - 2]; } /* make sure byte 40 is always 0 */ - dst[DSS_FRAME_SIZE - 2] = 0; + data[DSS_FRAME_SIZE - 2] = 0; ctx->swap ^= 1; } @@ -229,7 +225,7 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = 0; if (ctx->counter < read_size) { - ret = avio_read(s->pb, ctx->dss_sp_buf + buff_offset, + ret = avio_read(s->pb, pkt->data + buff_offset, ctx->counter); if (ret < ctx->counter) goto error_eof; @@ -239,12 +235,13 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) } ctx->counter -= read_size; - ret = avio_read(s->pb, ctx->dss_sp_buf + offset + buff_offset, + /* This will read one byte into pkt's padding if buff_offset == 3 */ + ret = avio_read(s->pb, pkt->data + offset + buff_offset, read_size - offset); if (ret < read_size - offset) goto error_eof; - dss_sp_byte_swap(ctx, pkt->data, ctx->dss_sp_buf); + dss_sp_byte_swap(ctx, pkt->data); if (ctx->dss_sp_swap_byte < 0) { return AVERROR(EAGAIN); From patchwork Thu Apr 1 21:26:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26697 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 E2A9F44AE5E for ; Fri, 2 Apr 2021 00:27:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9EFE68A636; Fri, 2 Apr 2021 00:27:11 +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-db8eur05olkn2031.outbound.protection.outlook.com [40.92.89.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2229A68A628 for ; Fri, 2 Apr 2021 00:27:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CYxIJAmLHDDWhJGmwtLSdZV4M2k+yTccmfKF59UWO3+2+MawQN2yuG2MzOdV/746h0FkZ0n6BxUjb0eAKUnYh8+Ifc/AU5kIaIf/w4bE09zg8xwceThI5ZMuu2Ibc3vZPBspWzbau39U2LKqWpXNmKC8cvsC6Yg6sKBW4FsqWlU/UHRwuVDYsPiZunv7L9y/YIZB2ehnDhIeGckEdiFAvLXBYONymEqXaxMzmrhUqO1TuJJWkHSAzbO7kBbm0oPyc3IABWkVxJY8HpQWJ9S4q5haVoM9NqcqggL4WpugdlCHuz6XLl5m6fxp2htBjGZ+5SDvYrYwuM8x3QymmaEKFA== 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=a07/N4CL+j2sP4/Rx0R6V+ppRppMzYNntFyGab3nzMk=; b=Ytg++JJOn1p09uCUVPIeuDDHjgEvAnQ/knseyn2cy36uLJh3Kpvm8/5HpoEqVtIQJblBVfXPLkUMyDzmn9MA71IMd9wO0xxf6Xbom2oVATa3HeKWcB3tjSxTMC3DfljY2OoWlo+4L7WdxiDKT7VObILtGgJmmU7P8mHRE33mcWtDvJm0yZLaVrhaHAlQrMj2S3phBW5+KDpUx7kSe6tEz7IINV7f0iIvjBa12b0qx5n7BQDuKMhYmVb9SiSM8jBgZ3Dgi0Qc46Ydip5MC8TJnyKoOdXdeI0eE0Sd60jcW1u3VFkT/s+Psj2ZTX4q/DZk6pBjuQ4MMpXDibbBb4PHYw== 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=a07/N4CL+j2sP4/Rx0R6V+ppRppMzYNntFyGab3nzMk=; b=egSwtxOh1MLWNEgyldA0xg6WVS6wFAQaQQUR9ZO+odsyLF5ASIH89pM1ZoNR9duy20iBBvDP5QCDyQsjs3jYrv42cNPNRsyDxNdWvzUBu5l79iIt0h/CdgsoEibrWT9hoz6WWw2QjLhWVnM/2uyLmDF0rhIeW0SX3eS8/wKOzrvuXCULW/lRNKG48/WW6oJbsn8C1CooDnWIy68V25EDswV/+YQHwir21OMRK5+rTo0ScnVYhE7mlN2gI/HjKhstBju/9hcXTyRTXdiR1ZzExpsV3kJgisSjyvYeeJUvELxtTZL4wureni1h86d50NzXZ4DIvApmZb1A5PbR3Dbc2Q== Received: from DB8EUR05FT053.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::47) by DB8EUR05HT035.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::334) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25; Thu, 1 Apr 2021 21:27:06 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::51) by DB8EUR05FT053.mail.protection.outlook.com (2a01:111:e400:fc0f::98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:27:06 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6E2505DD53922F98806D5DA4BA128F337185F173C65B9038431C32F016DB3021; UpperCasedChecksum:5BC2CFB2D15371D49B72DFF7B6C9A747241A10D2351DAB67E9C7EC0BBB5D9E1E; SizeAsReceived:7572; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.028; Thu, 1 Apr 2021 21:27:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 23:26:10 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [toE0MvJiclUw0M7kKM6V/xMfEOFGVtx2] X-ClientProxiedBy: AM0PR02CA0112.eurprd02.prod.outlook.com (2603:10a6:20b:28c::9) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210401212612.2343423-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR02CA0112.eurprd02.prod.outlook.com (2603:10a6:20b:28c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27 via Frontend Transport; Thu, 1 Apr 2021 21:27:05 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 6d823b7e-021a-4eed-06d1-08d8f554e633 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRmQk3JzeNKq1p0dsiv88hWsDs5ClWXqLlzvIasYJc3QqQyjuIO/uyu2NrZ/0D9LtTcdeaotEDf1c5Sm1w6JY/DwdLzsxiry20qDHUunkq2phJ77wDxUpEKlJ4Yvlp2laK9pZB7bMPQMk5m5cJnZtuWbn4RC6XsvuPMnHAYu445plKEo5xRwOzBm9kVmy8RRLFHpmMG1uEd3wQHxVkLPu6hZN0nxDrEaAU2soQN/0+TY5JrfkeC7ozcLLHKVpXEB9XFmS5i2WRjyrc6cjtMYlfPcgq2kuyiVFnHa3jzOuCETYDqKYmxnrop2mfG41wM05NLksRwpjBFhnuQKL/Vy3Lgx05F3OK1Zmbpn8uIzmj/TzTAket22Qym1PsitLOje/z6VL5I6H7Q40iohH9r36I7f1xCUC39ikwPoyhas/HiskhhO8UR716dBCmMqfxVIUfShkCnpvyzEfi1AiuPFobyEn0Fm0ixLzmOzVzfffvPuupS9lw0Dmoq0rNfIGmbzgz50uJxRSV+qcWQrJL4uJqOaHI/qt5brSe1o1bGaoZGK8VRKlkkT85NSUIWZKZw7Y32hBW8DNBteivT5pzr+HOPDVWGNM1Mgf9VmWDppn7M3DUR75J5GwJPk//SZ1CpI6U885ITo0CF06hsRZ2GghT7FAFLyIR5fRmoL1Xy+4leznokJLAqJbdoXSENee2bQ4c+shFsB5lnyNTXmhbpSBUh2GiFsT/5QlZRKoUz+jCSQblMX9iE2H/XP608/YtXzYc= X-MS-TrafficTypeDiagnostic: DB8EUR05HT035: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hW1jC1IKq02W+KLnOxptdW8qeRYriRAGubbp/cHwGduzQzqJmvaCI6KogwpNa1FLkniKEUBmIwAxSeZsLyjDFDEAGXtG59GYD3AgwcQDADU1vBQ3alJZw01ECccUmpVjwNgKabnmXocH1PF3dYTz487zwNulOEE1ODSFGk3UpQqHIM8ApshRHKmFuRlgYEmlhq3FFsJvS6ioTCD5E+BTVxryB39mSJsKdKqjzRBQx2PfMwd7qA+vOz+93z1vjGTWw0FDRf/0js1xLacZAvmga4pTdiZhU7ttZK5gDRqiclc7WuxIxwm4gk8cSz2vSS3i5L/+FWK0fPj0EYrKGFCzr9bfzU2wlP64zuWO8tgoHP5TcVrmnJf+nIegg0SM5dMXWgJTIbvzy7eHgie/YKdzaQ== X-MS-Exchange-AntiSpam-MessageData: DeFAAyKl/oV2rB88qO0G8+v3nxgoRNyWE4eZrsohhXwosm3ff7XH9D7CzjLQ4t+Ydca9JoGgfY4exHnMA0NNLji2XfoalZPVPTS+7ZS6sGZ6ASy0drKVlo/PoHP0pQpkLL1miXJueo/eIEqHU+ig9w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d823b7e-021a-4eed-06d1-08d8f554e633 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 21:27:06.3185 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT053.eop-eur05.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: DB8EUR05HT035 Subject: [FFmpeg-devel] [PATCH 5/7] avformat/dss: Return 0 on success 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/dss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dss.c b/libavformat/dss.c index f4545326d2..fe8fd5cebb 100644 --- a/libavformat/dss.c +++ b/libavformat/dss.c @@ -247,7 +247,7 @@ static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EAGAIN); } - return pkt->size; + return 0; error_eof: return ret < 0 ? ret : AVERROR_EOF; @@ -302,7 +302,7 @@ static int dss_723_1_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < size) return ret < 0 ? ret : AVERROR_EOF; - return pkt->size; + return 0; } static int dss_read_packet(AVFormatContext *s, AVPacket *pkt) From patchwork Thu Apr 1 21:26:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26698 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 F0EF244AE5E for ; Fri, 2 Apr 2021 00:27:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB65168A6E7; Fri, 2 Apr 2021 00:27:14 +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 11C6D68A581 for ; Fri, 2 Apr 2021 00:27:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cJIV5TvPUqy8zqUP4s5PExpruidZAyV2KO7oZIKp2Ast4XG6fmlMOHapO1X4ga1i3e6fnK1GBdXJdTbxjfv16Vpn6ddChyB4vqOyBwtmUjSskbrfC79yzs1ngMp8T1aufgZa2ay2L7eIy69LgPiClfVawyFUyAQ6DuNtwSgK9yUJ1NdYK+L4K6P08HGI9HWB1WePovW9HSJEppObXs8plyz9ZnvydELeZivErlziHcjPdiX6KSpn9M5Xed2nx30t7JgbhgziW5px64MMuhHodvmEJ60BVKDy6CdqbroW3pqD2SY6HwMRZk3GZq3wKcBPrL+cPUdtzDO/VVtoZbJbKw== 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=D7ZT4AJJ914fu73fCb8iNlQhO3ulFezRMydaTaNFw4o=; b=ONASCSR0FBHrIfY2o2thpfHqyVPpi/jCrk/LBNBo2jh+RfoT044s6iqgQorKnMIf1SukKt4B/JJGhKMpe53nhxJsE4g6XSQZC+WeE0W1pMUfLS19SRjfG2HtMpdHzM/zEd4r3ZmPKN46oAnA6jLVLIaU7sS1Vg91a2FA11RCaGaNBjh2ZdQIWd08bApE1J0BJNbP/jIAQJq+D7ok2KITZREUfFGCxatrcWpCB9KEfgoKHXKe1kGlZKq+BW2LBbMJqyie36juO5uGAnY6yZaFRSvrcKqZc14zA/alQYvSBAvuz5SFTU5GB//t98UEeJfPbCssLFhKjLm1A0crWOM8pw== 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=D7ZT4AJJ914fu73fCb8iNlQhO3ulFezRMydaTaNFw4o=; b=plBYkH7MdllemUFXsY9ejAbJ78XBFan+xAjKObbGlwF4LMY+5dC5vKF185WoMYN/zlCg3Gqfw6z+Zr+tzMu5HRsAi+x6W9792i5wxCIJu8mvcE8i+1J80WU9TtOQFFSqJWZfAKgBzM55LP3yeMlh9NYaKaxSOJj0Qb2wAVdHm5YQxHrPAyRZaX+NS74vA+bv08PkbQkLVkvcrxZVLjKoXDrzgFLTgfFSfHPF693Dc4lJ5rD3P9xE38pzbmMOoGMv6GSRZDtPfSKjk46jjasiH6if4tIz/mCePnQKsAU22P0i+L+6u4ldvJ85k5HizMuX+tjO4k7DGfVUBO1ayPXIqw== Received: from DB8EUR05FT053.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::42) by DB8EUR05HT120.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::466) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Thu, 1 Apr 2021 21:27:07 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::51) by DB8EUR05FT053.mail.protection.outlook.com (2a01:111:e400:fc0f::98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:27:07 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:955B30FCC258D49C77766D71D3D90F8EC582306E5AD7E20A8B0049D3E14DD08F; UpperCasedChecksum:9F53E0B4BCEDEB7176BED62FA5666B8EC3B2D01B2BBD793A242A0B987586E8EF; SizeAsReceived:7589; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.028; Thu, 1 Apr 2021 21:27:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 23:26:11 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [VjArq7mtjV59Tek+AIzG2yFYLiF3vic4] X-ClientProxiedBy: AM0PR02CA0112.eurprd02.prod.outlook.com (2603:10a6:20b:28c::9) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210401212612.2343423-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR02CA0112.eurprd02.prod.outlook.com (2603:10a6:20b:28c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27 via Frontend Transport; Thu, 1 Apr 2021 21:27:06 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 67b38db7-1ff4-40fa-376f-08d8f554e690 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXIGlc7gHXb8Sy31K73vdRq+/LqEkopvOUOpepfpwI7m1nmoT8EPfsNxxtWDUu8lHLWVgaFhoVzK4sgjWbT3Zuw9pok330vXTt4Rhd0lN2NzerpvADifpgSFk9cDOR6vCh9nkhk4cfbWB2O4SKTItzRHRTKFeqdRonMNIDQ3G811UwhsuWq3tDHvDNJHxYThpCu3lo5s7G4eykvkXrgk9fVyibCZ7crZLB/6zvLtXru/Z82fqnoBCiDmLmYxQwMfC8QkZMHx/bcNAOUQDCqq8NO+OYpev1BPx4uTGfBDx+7Lr+AGf+7ec4NKYmLWbwNcHGjGvuTFoI81AcqZsp2Y5P/qL7kXsbsAGQbDojc3C+Cmt5KAx/cm+ZcgT0raV0xqvPbGlj8g4bQeKEBsftrKcU9JG7UXO83+4fMSsFcwDUawBaOiz+c4dsxA2RadAf09fDTomr/Z5cxj8swqFCr0mAA26zFQnENxJ4wsLCco8/mMnsfzCNWylS3B/FzyYcFYWOf8szm3FH5iSeBk40t7yF96tXfkjtWRQq7U8cyIDEb3UWfbxSagIIJI7sOs7oDI8GkiZW4ZdpIZkh1kdeb2mSWW8F+mtnKMBC+qWO+qRuo+X3J6aSVPswnLC0ZAkU8meGslFiiAo0+buxeh6iff/CNPvS89hCrvTIgpwT3liBovahiQTZ5uVhaqtrZOR1kH6q6+fgdHD6QdNLVEhktUnsEA1mWoGyWlsM= X-MS-TrafficTypeDiagnostic: DB8EUR05HT120: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a77OwxxptnqLYsJnQrM9ZQDnL9QuLq2Sbr0CVV/SpKRoqqmNb/VUR21mRxfMPDlp6lGGJdD9lXonQ/0CZ+fpawnIsGl0EfSNBvWTpe8gTm0ZjitRLMi9mp0K6mypTsLg97LjbBZ8s/umcRFZvycvkyIaJhmNfyZ8cJ9fVY2HUdHFbKcONwDO6f/WJe11i2Xp/qCn+2qSZBIpIT4UsC/Mdn1CpVTGSO4qbFDQeHBTd0ERkrNFZboFxSTrplxp9kYcGdPbGYOl6Z+kJJvH2nIvtAzJHbyTI07LNlY99QcwmeZCDhGfTvgBGziXFE1aipuA10xIuWiRreGc3KDO+butosp3GDa18tPm6seSg1zNmebcudjDLWcSqWvyXg1lVsIlV4CE9jrw3lcL4LWj0ABp6w== X-MS-Exchange-AntiSpam-MessageData: B8gK/1e2WXr/+SXXxtjpdqmtPv4y+QFh3VAt+/ZauI6Vza1A7hik/TE+JHjnCKma8Z/O7P0BwhB4jbM2a4UrNd71oiPhoJFXJ0prih13EaPVVr1abfslZkFDWFBwa5K7Nl5oSMNNVqrZwXWiW1UoJA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67b38db7-1ff4-40fa-376f-08d8f554e690 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 21:27:06.9113 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT053.eop-eur05.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: DB8EUR05HT120 Subject: [FFmpeg-devel] [PATCH 6/7] avutil/frame: Return 0 on success in av_frame_ref() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" av_frame_copy() is allowed to return values >= 0 on success, whereas the documentation of av_frame_ref() states that the return value is 0 on success. Ergo the latter must not just return the former's return value. Signed-off-by: Andreas Rheinhardt --- libavutil/frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 31a2117b82..fefb2b69c0 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -469,7 +469,7 @@ int av_frame_ref(AVFrame *dst, const AVFrame *src) if (ret < 0) goto fail; - return ret; + return 0; } /* ref the buffers */ From patchwork Thu Apr 1 21:26:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26699 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 EEF1B44AE5E for ; Fri, 2 Apr 2021 00:27:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D32F668A6F0; Fri, 2 Apr 2021 00:27:17 +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-db8eur05olkn2101.outbound.protection.outlook.com [40.92.89.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80DEE68A628 for ; Fri, 2 Apr 2021 00:27:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O2aZYPaqxvbcJHIdF0NuFGOXvEML2n7nNeR59WQVYaEX6inV1j3RJFO12suoaQXtjEMcSgwbx5ICyC1Kv3BuTGJXbcZEO72LwNq6inR4cqOVitJaYakPaQP5W4LLz1ju3anC4U6EXLxa7jw+9FMllQ2x4qObH2M1zZv2DSla6KUMRBOWkgbakRBmXVyJB+pVx/FolrIUTC3Zd7HbhQ8d8sB1iEGXJV20ESvX5NYS4KNcOBL/RD4IBurlZEMU7bHVg7IfwNbaeyNNasNkLhB59sS43XRBZdBX1VlHVdw8Weyw/7JpsJq8qIwZGPyK6IezbdZ1SoTfVRJd/ZSNyt+MnQ== 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=STIMY46HOyxOcfBaf6vzOvMcNasF5Yne/iTSFYsbZqk=; b=B+O7ZOy3fjdrPrHghdNFuvt6NF9tvhPsW1iHf0qJ8hqG+AAJuTJZQD/GKjU7p+XTG4XUp79BzpSyjtlYTCO50M43HK7FMrYyW5UuwyRGhZ31cVJkLPotMzuB7BMs1NHkXxiO/2j5P/z/TKuFwpjeuo5bBkwhznd0M2MyMtQMWdbspD1VVukmBpky/AJzyT2MElubeJdmjNSnvYDiaHxxZHupNomlLuSE3dK4y6HbyIaS0bZ2C5F0zcRhDCc/SUgXx4rphSXPqlTtO1whrEljvXb3i2agMQ/RiZ5am3EOCwVdjE+hcGCKQxJATowdCRYffpbpmXMDAQZwJPluhaXibw== 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=STIMY46HOyxOcfBaf6vzOvMcNasF5Yne/iTSFYsbZqk=; b=c4PifYCgqQ6qsbHq6gAmAtBAuXgF+eZ/Qy4BITq1uZ65d8vHyamqsNXJ1fsrguQTUxFxl3NY9goHA9r0n6lc635DQ0s3TApJwTEJ59N2JML0dtrCjrvSAonQX/GiW2mBZnbLM+PiI000iLyPnrtqBpnRKgxg9zPcWAWxWNoquwQy65qamqkBIhUf1qeUxOwpgYz96d9z9CqzOwi2cBOPbx4HBB8qyqdqHJjf202pXzOcpjU1M3cLjtknBRUGi/rc+r0jolLVXx+JyNQ+0aZiOA2tRlaJlnlIQ54UTBWEnzeOEDXwea1Jsior3U2Kv8HSRuBEP9pTX46Rlaaz2QNTYQ== Received: from DB8EUR05FT053.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::52) by DB8EUR05HT202.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::351) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Thu, 1 Apr 2021 21:27:07 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::51) by DB8EUR05FT053.mail.protection.outlook.com (2a01:111:e400:fc0f::98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Thu, 1 Apr 2021 21:27:07 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:27DF7BDE783F3B0D87A8662730DCD3E283290A6658C037AA133EA115554604F4; UpperCasedChecksum:BF46E57DE379AD292B1E72E5FB80220FC53868728C848F67744ADBB492D787D8; SizeAsReceived:7580; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.028; Thu, 1 Apr 2021 21:27:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 23:26:12 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [nZgDwLkfW1SBU6BMnAxdCvOCkUYRdd5A] X-ClientProxiedBy: AM0PR02CA0112.eurprd02.prod.outlook.com (2603:10a6:20b:28c::9) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210401212612.2343423-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR02CA0112.eurprd02.prod.outlook.com (2603:10a6:20b:28c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27 via Frontend Transport; Thu, 1 Apr 2021 21:27:07 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: cc2e6b43-9570-4cec-0d0d-08d8f554e6ea X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKNJu80vzaGCFsmWhGxAbOXzbDPtstLkYmEcgg/wXaWmbk3V1fgzzOWxTE1X8bl0AWIAHAII0OM43vrwbqxDRPjbn48o1FEboxxuMnzZWzi1iE7yizKRlXG+e6QMKqjyUMvajmlVqoBBMPk7jZruyiSEOb1LZmVG7j/IpznfFoy7cSMnxKKjqSyK0BAhkd5dY5kdfYBUboVpQaAGhAP0DAJ2WfWu6YiIOu4cD3Ar4Fr3mgVuO4zmt2AyNy4UOeo5iVE3PwZX6BgTpQkkiaVPdCRiTs9CyXecvhHXvwe+ECaglEoX8Ecwx0tacduEFAmrMSaqWI0cWm1Kp5709pr9ghCpJQoWYlueSjy5s21wVUkcDg85jIeTugj31WYA8xyIaFDvTYhgZpD37oU77jgwIa4yLXtTASc07hzrRCG7pg+YNoCF5VeJ775qUZQ2i2OfeRMBbd5OtMQOAzK84FD0Rz8rzA1fmyok88Q+BAKeUQaLISss2cIXsT4G6gT7Yr1S6tE6aXLok5xK+ry5PBoKupp6XwxDHHvKox41nfFbtbUKCHpU7NaHt5UrehFFKLcOgQlRaz3MlO3Ubag0TRu6qrm81wip16wsfCMw6TTnUQjskcCXdCdkAWTBE5DEN03x9zNcL+w5CpwJoxp2biCzTa3zwKQOD1BMeyF0lj6/95FuyInv2PPDj44mXsM1jmYZ7DBrMfuvw9dxg== X-MS-TrafficTypeDiagnostic: DB8EUR05HT202: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jRouSB5kEQBTiIxRIx6QcLHOYAotXH/xjVtzN8q2991BY45I6WYXyofpfKHDYW4H7mIB28i0T5V3QiVM4TQyPycrvyY/DONZgfauKmDf0ftLSrZdXDaHpPSHqEIjZ5Sw2sz12GPmw2H2O0mh7XAUGcAK2Hhu+UaggbG+C2iZjwNMWp24Msug5JOZXNZRvl3+Zkjl7SDzbE6o5IPDtAb7LVLWlOnqNxU53SEhr/Zj/0buIWv76fZnCJ6haIbol88H/SZ5N+HU+PnCuQO17gCn9fsj0atNlSdh72NR5wKz7+/nDMWZVLnpqoIenSLp+xyJ9NFWdVICFw6Bqv6Pm0bhQqMPa9CdKp44hbNk7so3oKyv6OINddgAihW82Vr/+D2wXbawy/GGFG9RhjMnDhoECQ== X-MS-Exchange-AntiSpam-MessageData: QBrnCjiaIjw9gkdHdccWrSYWPke63WGXeRcPq4xprlpk2nOIADG8wrXClugOIdkgy2u/6HxHVi3NKM6FjURlf6SbyitAYfDYuwBFpGbyQ5V/x8YwszqenuOZK3hmczSr/JG2iieI/PtehxXWdeQD1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc2e6b43-9570-4cec-0d0d-08d8f554e6ea X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 21:27:07.5060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT053.eop-eur05.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: DB8EUR05HT202 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/options: Remove always-true check 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Every codec has a name. Signed-off-by: Andreas Rheinhardt --- libavcodec/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 58c7ce8d62..b8d4a9faf6 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -39,7 +39,7 @@ FF_ENABLE_DEPRECATION_WARNINGS static const char* context_to_name(void* ptr) { AVCodecContext *avc= ptr; - if(avc && avc->codec && avc->codec->name) + if (avc && avc->codec) return avc->codec->name; else return "NULL";