From patchwork Wed Oct 26 02:01:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39010 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp148639pzd; Tue, 25 Oct 2022 19:02:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6D1DYQfWBykrNZaA5DFDUCXpNZORsPA1VARJjy7Q7aOmhCI8nBQmSZpJTDsTXUBh4ioNJc X-Received: by 2002:a17:907:dac:b0:78e:17a0:d1cb with SMTP id go44-20020a1709070dac00b0078e17a0d1cbmr35560409ejc.618.1666749747243; Tue, 25 Oct 2022 19:02:27 -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 k3-20020a50c8c3000000b0045bdff8a884si3541914edh.268.2022.10.25.19.02.26; Tue, 25 Oct 2022 19:02:27 -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=ANr74FqG; 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 68C3268BC68; Wed, 26 Oct 2022 05:02:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE9EE68BC1C for ; Wed, 26 Oct 2022 05:02:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PStuRhZQb2ankUG6qRNdeaC1Pq+W+bbyX85OJausW71UIb0YomGrkBRitDaZyTERth65pSPX/orNVmLfgX6XqhDnDlDaJoYuwuBOyTIJS3G6+GBQLdGMJRrVcp4olDegFOslhP/O3Ko6QYS+ZSTZQUw2o+6zJKqsSv4fdRO/u5LthQf4Za+At/rnlggZgSATrvEAmg4Eflh1miFzx5SMhpIqhaaKZrhSqveBxzAyN7AYKzqKvz6wNtl7/eKVDvMB9HQt46dURcdkS5rhYZi0av2TXODFgjjdYBo7TSTqz3hF8RsXQkrsX/RT8wQxb7arrB8HjAimYByGQ8+YQmu54w== 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=3NfpDle9LVjRz/23tgNOL1pt+hgCuDQ+MbO+cjV0Y18=; b=C3G9kotLdeSwmZmsYikazkkquFwS26qBwD+DjADPqL5collk6MOcsaMWTakkTenr3/9IH3JoQGb5GGS1ilBP5okTQkflpSwujc9StBNUTgQy4PMkTcggiwz2moWauFw0JBpvoTIc6SB1imDpI0tVFn08PH85c32BFVd7XEuilT5bZmfABprU02EAcx+kEtR07IAL7J91+ML7yXPXEGDS9bZRNcj6u/mxUvS2lJ9fKu0NzYQTAER7Ejuye0BawZ0uxxDoN9Oa9vy6aSwE9CwiaSX5tK7BkTiDbNijvnOQ7NzVwytwKVrmrLCBgKlRVDU2I4T2YHfSVYoGO36/U7oBdw== 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=3NfpDle9LVjRz/23tgNOL1pt+hgCuDQ+MbO+cjV0Y18=; b=ANr74FqGLTTKhUBsNqsFi218EgpJATRV2EQ4l+XkchTd7Pnb5gAoNsuXSIUFl++gR+yU7qLTzeO0kv8SVit6ZMa7qXT4ba9R+RPD7PiymOfYOrcaD2Y51s16A+fJzYAs6F2BPNCv+sec8nDmXPsoYXX92E2lSUkqUk5RSOgoj2Ak6XTi/wtd1IoJpdVW1AlYMigb7S7eL9VjwVWMfREKNPmddx7u52I6yMkZBWMYg0cNNH89O5qzHjQXrOb8Y1onwHwh5rhUlRGU9r6hrGbIAQsMRy5vO5Cv/xbjkVaAqbrf3uV8v/gcHgcsz1BWWNkJVi2DR70REKXJ5rR/nlFxCQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0067.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:172::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Wed, 26 Oct 2022 02:02:09 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Wed, 26 Oct 2022 02:02:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Oct 2022 04:01:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XWOW7/Tj9rTbwc/foA+t30ckVH4uI6hzaLDaYmclKSo=] X-ClientProxiedBy: FR0P281CA0133.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221026020148.1899997-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0067:EE_ X-MS-Office365-Filtering-Correlation-Id: c449f046-3e41-41f7-d2f4-08dab6f616f6 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoSzhB4sgWW4MC2Y4ACp8EGUboAi/w/qNw+tHBcw9x4QWRc8in9cFYZkI6V1oqat3coPlXIAFst2eJejFdxjhR4yB3XLheZLfnZGN/Y35NKc86WBlag5yL/LPG5qyxDX//zn51IurCY/pO1+XAPy39Iaf/h355u2GA7KXkDYZ9PleHRT/UC8rtQGY7MshDn4h5EIIYQtI0eQwLyPGr+l+/CQUN8S81eAFJgstDM8lI1IrVmLCKNUEp1NLkdarb1laMLtdSBBY8naBKnr/VyMxtk5TuwMIj1xxWx6pShT8Ta9Tu2lAIrMV0oX6/zLfIZkqt2jf8yrm8r13mKTz/NaxMhrhymhdE4kudQk5znbVMwE7CoFQQLeZQhPnvX6MDKM36joeK0qXJpWqSK4GGciGkfct9A9xNPu7Ir3ECrgEcY0LSN6S4i6sj1Gc4dYtmsx4+2fXj8WLL8ku62dm3t1gJ154uI8kas0yKNT6jQx6+oyO3g8BDbFp1Q118bryrn1X4BqtF7W1uUpDTsDKQlDPHE/dr9F7jAJaJCyEOU5Hnt2ciRh2+faqgtZp9XGx3da5dPte1Y/3VcsHJnGi15Wte+0cZwrPlInyvPmUx7vHTgCV19Lsd1K+eumVpJuLMGFVFaHvUSpXsrIAMWHOMTp/7ZCM9zNS6Q/xQgkkvK5jEN0Is8cyA27PKIWmXi5BBtK2UtBHsmNQpHnHVWJeRSVkpsZ2+PEZCn3AiI/TevzNU7b9XIjlDmLqTKTj0cJpakqCA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M9mXmpXVmGhKCejLEHCLW7XxfiDAR1wpia30mezJ665VNeg+73wvF8RjS9gZ2I/xSackDTP87YsNgC07bAKhzQZlpRKgx2fUwhqoGZKgUCrbZA7btUQLn+z/TYW9qjbYuiV73lih5S/CR1nCQrT/9fHB39jOA5C2YrLBJzzR3q8dAEwZ29uhFyNmsAMMuisFtwQWyY+tTJVnJeM+wNcQwYGHOLCI+UAVjbHPglwn70sANQ+fY9BH5HLzDt3b6PMEZRfgju7hy0kopFm4svkyl4PcFvKr5QiHHmRVZVvDduj6DphvFlsZvP1KfkQxqadzh+s6HL8jj+HybrWNQVa8by12qK2pH1cqrLG0y5ybFb/b99BkET79+0ZD+UCq5nCiWGJ0GqMeJZtKvVYT1cDypDEhKKpXZcOh0sNSV6TjMsMrKA661N7MsPCAMVhTdbj3LiXF33pUIGjwQUKqDQUOXRHiZ0994fFe+TyM/lRXVnmvIDtfO3wluDXrLHkJXOveDKBJyIQsYeLxf6L+SA20Oy6x2DLtpQ4TxtcionrktBAvkKS2IOYseHNsEmn5Gb4GuS87OwDCtloYRr0SJHygYl7eqArIJwtma0ZJow8A8LzgPSlZxivFvDWJWbKRcggswUXWnQJ4lQ1chXQzis9J7dpllOlVxhZK32S+hBwhYZ6+GHwEnCUXEv5de2w+sweh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LmWHPFlj+Mk9qXGDVbL0yr9rA7tcNLusX6MJQCjnAQIieJW/1pukqukWi2ucXLgBxpAV+icd636414MTiayTHGKtAD1SEguyeUPlCSq+Vefiyoxks34/I6mbUHaUDbGbbVOugAFHn1J6t6XlYt68AJOoHx6jxM5Dv2B+XzhYWQk8YiSSTm27qp3hMe57ieEd992SAxab58uwoBSXLJ/tbaNaaHSFWLdIx1+Zb3/QVkF30xuLZoIffm4oCzfkZ7sHRaTvr5SZwPLacEN2y54jiYXY75fm50c1xAb2FxQC1zoTzylWRUdZyrmAhbTZzgu6S7Q8s+p/mrbTLCTpP+USaB0+t3FzWVLf4QmXH5qsBGcN3q7taFM8w3DUns4hZhy9x+TXJye79y/lRe9BojrhmUcBZfcmHKaWG9cUUUUmzbKlrfKJhjyRm93NOBuo2fDs7wUYZeoLRXT/GFLXfYJAikl3zLtTW4hRmsKWYzLR9gZ1z2KhgRNFVhWR+nV3VAm5gV4hcKIf1k5pS4wFi7lyoAbbJOBtD8zrZfsFEkrumS6CjXHXK793Vka4U+UGJSdKhEsOEq5s9ePXAa1/OYT1WlJPyLp3hWFX859cxtSi5TpPGdSX8W+TjJ8bYaGmmEr5gv4iQQloUDPHoqUfSGbIm+tfrVw5T6XcbwksGNduqBvsbEePqfixzRRjl2qLXOv9oxD82YZ0PT63Fvsu2Qby2vLejVgotBvRumC9Y+GiujwDbr0j+aVxekI1puFfTV44CxiOV5Wsz3dYKga6wp4jWO8SBePMZ91/4L5UqKmu2BKvwdCi1aatxZNDNtFf42ndNjpycPl5z8Nop4edvnVPFJ5To7H5UBdnbODXo/4XuJ0pmdjZLThm2Ub/uFFSSptXSiiylAVUOpS+ixcdZEXYMzu50VzYhAk0otIxncIZ6fATp9G/girM/cbKJgxj+NyHsjrJZMUxhHpEzcxYmPB30SbXOi62x6AJYUnyy1+Kul5/5ShUM/BmwKp/OPpmzp/EK8BI676hBNLie93UZrJLCbM7wuG4lYjSx1b+zkNV15WKhiLp8/dctClQllpryRyin4R4mpuFYXBohwoOxFaKcCGz3+3XpS/qBEFz/Q87GYgpoZRRBk0y+BebAWW9uFTWsVLV8bRZfQv0aNtMY0Q5XWUARevuEFY/u8L5SxX6QW8VIKW1aNexTI4ceBDGrgNiburXgeJsJhQAUZv5CJl+jiJQ3VgZpe7PkRBxRk0o8ixQBDPLKup3xso8D3ke7fuxp0gKUP7ceawFta7HSvTE5mNUvS5nlW2ve76UdoNRY8NWHl+bVeqxrArTeBK/ZpQE X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c449f046-3e41-41f7-d2f4-08dab6f616f6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 02:02:09.2018 (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: PR3P250MB0067 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/mpegvideo: Remove always-false check 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: Wr1Ddm8lEkCO This basically reverts cc0380222add8df8ff9b3bd95eaf2b9d8c4c0d11. At the time of said commit, cleanup on init failure was very buggy. For codecs with the INIT_CLEANUP cap, the close function could be called on error even before the private data has been allocated; and when using frame threading the same could also happen even without said flag. Some mpegvideo decoders were affected by the latter. Yet both of these issues have been fixed long ago, the latter in commit e9b66175793e5c2af19beefe8e143f6e4901b5df. Therefore the workaround in ff_mpv_common_end() can be removed. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index a04d519ccc..99b2d8f6de 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -789,9 +789,6 @@ void ff_mpv_free_context_frame(MpegEncContext *s) /* init common structure for both encoder and decoder */ void ff_mpv_common_end(MpegEncContext *s) { - if (!s) - return; - ff_mpv_free_context_frame(s); if (s->slice_context_count > 1) s->slice_context_count = 1;