From patchwork Fri Sep 24 16:37:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1699533iob; Fri, 24 Sep 2021 09:38:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGAjcNcJviK4KnSo2wWYpjd9rSS5QazTEzlcLuHK4jTJn1tLB1jFpCR7Zq03gi+VmhsQXz X-Received: by 2002:a17:906:6547:: with SMTP id u7mr12186329ejn.544.1632501537475; Fri, 24 Sep 2021 09:38:57 -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 v2si10022820ejv.739.2021.09.24.09.38.57; Fri, 24 Sep 2021 09:38:57 -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=UIddT1dP; 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 6AF0D68A7C2; Fri, 24 Sep 2021 19:38:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071017.outbound.protection.outlook.com [40.92.71.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC19968A79C for ; Fri, 24 Sep 2021 19:38:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cVtTywzXo2k21CwcSHKagPlnjTQQBAgaHn7yi4YJ6UmHNt2Sy90k/zwCGP3+D261wf7JQfNz0moeLNm2v65kdXdjyCoFTd9zqjs3cN9OcZiozO0LP1+7uNYqRiAZODDXJTgq3LgP2VL7Rok7lOsnnglCgbBM0kAQBva7b3ccs4fBt9iKZfqXI9ZlGAtsoZ6P5DRFIn+kglz6i8Chkkr4HQG/p/vlq1C5jTv9lHb0P3CWSsRuSAbKQkgZjoTUAb7LDMVC6VmghaBAj/9ZNHiKBXXBh1qrZo4NAq+1R5WyTL+f+l8vKcLsuaEtCltgUTUq/klQjKgp7MBYvrlK+bNHwQ== 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; bh=6E6UCfvTwAQ+LQ3zzcg1tbK5gyTnHu2vzORypd7aF9Y=; b=Nh1BoKwaHhdTsp9+AWuHQud10Q6gUcpTVFVD2Zdvq/4G06O6MGjN+5u3qfikxtgWaHt8ZiYbk/+i8+zl9DJRBPbo6ybYwAlBR/pxSrHV4tle+488nP3IB66YmjO09kSjNI+zIxAECdv0d5bUfiS4LgfCAmgAaUgpxheToaoDzQKBKm0fgeYjNqQi6oj1IHvSMLndtu+XFKCQQr+giWABdprbb18B9MhYHd3qmsRno26G4Ssyveig8ifN+Cf7+ldN/CL3dtODtGjiUYgSZj+DnukwGdJ/d8+hfEN0OjQfNbyIu/h93Y+yCnrjls2bhR4wB1Ro+gX6y+iMiN7QuZHtkw== 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=6E6UCfvTwAQ+LQ3zzcg1tbK5gyTnHu2vzORypd7aF9Y=; b=UIddT1dP3nOUJOrO9C5UAhaSaZhja5KWUtf9M1TWE8/TACbrbB+8VUmLQL3K3C6iULmifOieRuVRHu1mXhfmEmK/rNJ4l8VpoWPBkE+IaYz2dwHbIm/DnWlOdQH7qFRZ0gRORdcIl4O8F9LsXMpYeyCube4cOFz1QbVnMtBncaEq4mKyo68MMq5HqThtjAixNk//QI+GERt6242tjtDBNEsLK0D/osMsmNSSvWKYbFVW/Qnt3iNrlOZaY7+xHDVcxQZ+mnQ77c7zn1i727TtAKQAVxEK+18mtE3t3gVH/fcWEfIEs6XJyt7mnCKHZhzKGdPOkqfnJBgOZ1FSyINCmw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:38:00 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:38:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [cZThDPANB1CrKK9/57ZuUVrY4eBshejb] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:38:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e3b9367-a772-40cd-7aa0-08d97f79ac12 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIK/iSThOesseQkgEe+5WACm0S28irvxy4XNN9g0Yr6EgG5x9mKGupYYFWvD1odeUVNSypej96Wbd1ok5OGcjLscnpmOvGVrVAVzydq9+wkZUnxZ/mwcM7vdIgIyTNpiaaV4T+s3lcIw3A5cQNB6kNDjDv0vIMvQDPdIILU2lDwc9G85BXapfor+b6wttmD6vsxgbEmZm/KA/n1RUkl258N/Omt8L2mS7hljqvkTWh3LnKt+A/RWQekI8lZNxz97AeaywAr7GDeB8X6WcBjU3qCKMFLKg3mp+9XKf1vYo7dNQ8gShgBn7ZzRBs0d+1pw4+OQJAKKZIq88tvU9JgSE6nDw44Yl8GfGM9EcZKleEzG5yjxyCtN4DlGbtHqYKwd3dZYhzQ7AHDifp+OSNBCRd7+0CvlyJa79pLyRhSvO9vil7tfq46Qk6JK1sOrX/GUN1zdlY/w6boZqL85B3c0r9LUY2D0JOXGrqnnMw7jM6AQ182anApY7DqLiJCLloCpqNaaaadQa9kt+bwqDAeakTqJcx1xkRC17JLJEpvQrQF7HkU8UK3lKPAS852u6v1crauBbk1mu1Uw/tXOJas45LPrhsatZDxIMYu+2t/10XCM4PZ4Zk9z0CVeIvPS3P/tcZN7d5Y4ZIZPGabKFMMJ6YLrlMjDzvjyzTEDdlnwbKUSsmL4sZYOTYQZCh0RyVimjZjy4WSgLaUVuqatScICfuQGjJH4VHFd0= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4kDAMsvzTPGtHgITKw4ULfxS9k9xdrNLMxCNie5qkVkejy/HczIvoZjWbSI63m03I8yMM5HPXZA10RhetnpZxUqaYN4q5vXwYJ07OPEgWyNqQX736/0DE1ICEiYbP6Zj1+sadyUJXVTbDoS9dYezm7APZX6AL79sE+VuGptOz9MX9yxlLw4vcsUZsFz2fyHm8mfjezsqAExr02RUlBlrWjn5tDPvRJ15Ge8vXS1rBbsId926nWofA5aP6fuzpdPBSw+B38aLmPyZ7miUn5iLRRGdfCyyRTWAX6FS9KGmv2LwU0QJeceNsbFju4IPeSj9vid45HHYLwfFFivY8myr9kaoR31298s/U3M6nftbe/LMLRe9qUx0sGkCM4pYOHpyAlJ3gqoss+HhqTZNcoLK1bjhHpcYE4iIbXLTGzJE+ksifWHE7FdQdGLFAE6il526 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YWNM/OG+7ftOiI48YiamM4wfNEsSIld/VthSj0GHGiRUnDS6Kzkw4++O39rYJnd4+CohJ9QH4XIOF1R57NXlhoU6kIMPFhHGaT6ezxVboxTgWqEWUP8FsDAjiatyJVJRq1aYH9Oe5m6GplaTG01osQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e3b9367-a772-40cd-7aa0-08d97f79ac12 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:38:00.6339 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 10/11] avcodec/avcodec: Simplify check for flushing of bsf 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: I8mDknVQZUpH Just check for the existence of the bsf. This is equivalent to the old criterion of the AVCodecContext being a decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 5d85ed234b..ff3d73e237 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -418,7 +418,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx) avctx->pts_correction_last_pts = avctx->pts_correction_last_dts = INT64_MIN; - if (av_codec_is_decoder(avctx->codec)) + if (avci->bsf) av_bsf_flush(avci->bsf); }