Message ID | DB6PR0101MB22144AD0EDDCDD808D186AE48F739@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com |
---|---|
State | Accepted |
Commit | 52dcf0e0f56b4a696ba134221c03facdc166c7fc |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2229709pzh; Tue, 23 Aug 2022 18:41:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR7h1z+5bQqnBHOA8+hR34IJTLuFiFGgumGbcEp6CyaTCX44rQS1cWo1NxMFEPqBjFku3UDm X-Received: by 2002:a17:907:75c1:b0:72f:248d:5259 with SMTP id jl1-20020a17090775c100b0072f248d5259mr1434326ejc.227.1661305308028; Tue, 23 Aug 2022 18:41:48 -0700 (PDT) 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 z22-20020a50cd16000000b00445e1596c93si3224632edi.611.2022.08.23.18.41.47; Tue, 23 Aug 2022 18:41:48 -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=uNYTtGfy; 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 2E81868B9F8; Wed, 24 Aug 2022 04:40:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2017.outbound.protection.outlook.com [40.92.91.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C3D068B9DD for <ffmpeg-devel@ffmpeg.org>; Wed, 24 Aug 2022 04:40:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dcp+HxsmrasuvE93Y5f702pHnc42ITuIXOniJiKF2HzbJ1WBK8BEkdX/9c7madkFgqatW+oI/lthXb+3Z4J8HU900Nsrg45L8GdQnZKPIMq3Py7IbYz7xrtSChJs1imGB2Ectdvb+BCX1/DbWkriwsk9h7Pyxxy7m3mlfvT4PAIcqkmuC5Qz6kWbF+si9NoncR7/cKEb2Q+Ny6kW5aS/mndJIPJnpm5Y5Z0JpcHFwGiBIKVBdhpLUYF9I3XsDow/JVlzrlHmwdxBryX01CiHc8u/VwC+13kn8T97uLdekvy/VepmUKX79vOC82w3lF8azyAcRdTvWO2kqCd3ADh1Zg== 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=yuvZHGIPVdhrWpXdFDBeMMKz4URtWyShvJeW8rnxnAE=; b=WHwVa+WZGsCUzftx4XxWsr5MeUeJ82r0ehqHMcOgbsV+4ysu2C4Fekbse87aKbhPOlktmUieh4mU2wDHxM31OytC37dFSU9gwR4CX+N2tfK6rjOgijDJHTN6FQxwr/PCY7283p666gR38DG2FFkvhIzVbUB2kX0Of+qXuDJbFEV1dMQJSU3fDQhyJyNo/Of4JlHWwe4vhXXWHMb9UBEKF4fCQZf5z4NPAtD4mk9IcO4ZiRCZaVggCeix7hp0b/AA+vjNU6R5aDoeTpI0zkvIy0ACC1WfoJJvbxLeN0z45P1ZedfMyMcAWId7J0gAe/cXGsRDEhGUqu7TN8SVM8DpLA== 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=yuvZHGIPVdhrWpXdFDBeMMKz4URtWyShvJeW8rnxnAE=; b=uNYTtGfyRzqkaJ8uBXy++BbsMIiSH9csPMwbPysQUsYkGsmLRHqQH5z1tupTu+fzHVgUt0znbUEyzqsTiZxabOT51bghFoTI5pLiXj4ful2j06tK/FTEaxxZvf7kg+vuSkD3B+K0J5zTjt/Y3nTJMIEJ8M9A/Qq/rbnyacrB7lvflsJMzcvJjnEPb3HTTnZ3iqGsq6CpKMVpgxZVcJXCeqOkuggPmnRqaKPgnyKQ/0yTRr3SHRtYyraeHVxFCqfhDVqvpLcZb59yLStahhmU4/J/CnHaDgJpSP349LGtZ+Kh1J5gsoS5wj30Rk83+CTl766MPPiPBcbKi7svZNMYBQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS4PR01MB8966.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4e5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Wed, 24 Aug 2022 01:40:23 +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.5546.022; Wed, 24 Aug 2022 01:40:23 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 03:40:02 +0200 Message-ID: <DB6PR0101MB22144AD0EDDCDD808D186AE48F739@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <DB6PR0101MB22147759BB89DB6819E1B5998F739@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com> References: <DB6PR0101MB22147759BB89DB6819E1B5998F739@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com> X-TMN: [pQx4HrTM8glhvR9bVauuYpGMS0WFt6dG] X-ClientProxiedBy: ZR0P278CA0110.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::7) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220824014006.2441856-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b2c18d6b-f574-4827-1844-08da85719c92 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHUZZmI+UTsz2aPhBvdKn4MSmamuGSS9Dl8iFPIx/WojhBMXtdhXhtyFqFFjqtsK9pn1CBoLCCVHTXnWgHA2AyXFl1lHV+cO2kfCD9qUz3O8DazJ5EuEqP8JiLy/+xwuZ3ALaRn6wVc6p7svMTqIMcUkFiP2mxrqSwpfXgMNbypaNWtMW/8bqz9vb1/v4n2itjYWtrCjw5lVxEIfsReHUNKro03Juv4xiRnAzu2stULd8XsYcNXfEivAo59mhnowTsHRvxG2Nb9tfhSstkJ/EvncZCkeM5QPLSqugazbsyF1dY2HmWBSl/JCgEUHx7QHDK+3qE0isygMov818Apv6yXfsTs2xlfAbdsa73PshQaDtsJWTbko2J1iY/T9NJ/p0l3gOCJNp/cRNuHjlFnOfGRkn81fpbM8GpwfSYZTeZAXODVW9cLPeHmm/UhE7938cX+9hyXs8p8A/o/f+J0zgqNBC0/nHia3mC/dr0FyPFIv1RFOqTUxKubug6fTjnEvvThWNEWXMOPE55/P6GGZvMdpINNW19WZvhRlBnDGInjDx6sT27fbbS+AQPeeNFNyOojI00KGaa7AlYU3fvOqhzqUC03v3MH/JF4tt92jAQUr1j2mUusPUeIAeYrIgTl6wXSPLv3XkiB8gFFSgap98EwuejeUIUpyjFHB+CO2RsLFVRTsJG0FdI8FhQa9ZCa0Sur3Oo8+GocRkA== X-MS-TrafficTypeDiagnostic: AS4PR01MB8966:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fw6AhkxDtQsy2sbuRBLVG+l3D+8cxpHBbbXQ03BymexEtJMepRTMf7FG7ILVYvwRsuxCwmvcYdOlXIZuxdIEHj4rlgutRop+W5F7UGZYQm7mWEgVwhEhLsP3liLQa5T0EYEtuSzVNKPcZ9LufLLjEWZfVEVRQLw/PdtHmYx0UdOD4N54rGqZcR/cyeAJGCEGTovsPg4A9soSxrN5w7iZLWo7bbkdotLo5FC7bXqMQpe1wES9hRJ+rgl0fcM+lGKSz/tkfw/U7iWPct2oSnQ2kxd2xxnIGW71JSWZxGWzkOu5Kl0woVjfeJ/Bbj+Ox1KUrTBQUq9vUHQ5jao/GNoBpkRhzOsZsa//CvKAtzCe+4ycMEMkKde7LLxeFUJD8d4ItQROTBGjnrZ3+fhvtwMvtpcXf+Vo8jrsHafshnkgU2DDYagF+jTHusdG9uleHsCmheoesSwUsdx2TVFokgCQ5xSilxgAXNsIJLzHy5ys/LjVVRdqEheOeXDrSwqON5y590vsmwhRO0ILLxOoRH8moT3rpqUor/t8Msw+IkyZDVriAIUuZP44tG7nCtj8WT8eududqgTC2jbp8NqGckzYCk9KElxzUpCw6K4XY+xQdL/oEVqJ79xoVf2uMDpJbxclXn+cBWWCD96c/Z/Rn4w6Mg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vsR4aAIh8Xi4FGG3WFQHiPid44g4msH77qetMyBcGuRG38bED300wYY3mr3lFkBzKAIpoRqQJCKV5MY2zZDLBGIINCZ5di92+DdW8lLjb63+Z9Q20j48+IX8pMmpvu/Y6NpZQOeAU9T8E4D5d31b8tY9jToGf9cqvsvlZ7O1Pg08BqlLujDkLK480pzI6K2WVbvURzk2o9t06o/uGy3zBs7htQ58rl4lK3mCozVW0+Q/CfnoCZWgyODCULRRPne0rTsLSamtxnBzsuUgitE7PoP9jiT0Gq+ZoGSAzqn2UFq8F3F+KgtDIsUBHA5rEnJnJbtoqV+m+XB/VnFFZBTpXWyJmFBdkrUVgBBk+glyA34FERGKFAv2hy5UOIey9eWNxDBTXNH28jcCvnCN7JoOKCwglO/AFr8qRDwJAVUjotX3TMYzmYyV2LTh+NjaV5gzT2bvrWUdoLV21V/D4Q2NhSX0NXD3lRwkZIxolw+YFhLfNVSgsRW3THLQv6n11OO3jtkjv1L09W+6y9Ay2cCk6TEomrgRabJ89dmO7mhfZhdNqlfnsyOnyZULxCIGT6Qm5DBZHW7k3J9Fm7+hvkg3rSMub0NZVfoQigf+SabP5Ku8gbKzuSVCbsuiShSYF+Fd77Hk+ax0TluvTIJOH7YQvV1h8uJs0VAEij89qLSEbIPw/+TYlmA04SHhKV/fRJQMdl4XR3A2F+bIgj/xQSQyBwnAnKYqh5jlC0xZ5IEhE77EKn9ZbquwAWKI27T4+5Pr2SNFNfp32l8SXqhTVlKxfVoXLX6Os4URZ1m5H9O+kBzmCaIgIuSIp7wPkBK24rpq7jP1pdhdWB6w7l+AkcALuXcBVjWDCYFpHDhNdDhZfFDl6dxNBAS/bkQ6U6XJ9/Tc+Zatg15+uA2MvwrdlNstilWMUcz3r0EqLQvzpA6frf1J95AaCh/xuJEp2x/EzNyX73GQpQ1028Cgo4JTQKHiOsL55rcEcFMT/crvg1EvIpdT4uUy9IPIz5CyB8TQKAl92/Mn1dbmBtJaGWS9HcLvZLfm2tn6H0yC1D8biOWQ2R2PloFIY3cFm7+X01X5qEXDuxK8ggG46atN8d9f2EWsoGK0tuAMxQKnPl34umK86k9QugQGbfrXFTa9jGGbx+7S3zkKOW/0E5urmoPALDWeDJzQNrBjOZciDuTUS2pHLWfsWYHdaemn0rIg65YPEhNQL5aR2emq1syUbtne4TzVtYLuV85cM0LbZI/3LBDcury/qBPGL+aVg5Tld5SyiDYLaYXFty/JEJQadgnegV7yoPE0lGAN5JZjFMPfRDItSb8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2c18d6b-f574-4827-1844-08da85719c92 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 01:40:23.3933 (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: AS4PR01MB8966 Subject: [FFmpeg-devel] [PATCH 07/11] avcodec/encode: Remove redundant check 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: AjUmQPBAWQEd |
Series |
[FFmpeg-devel,01/11] avcodec/tests/avcodec: Mark frame-thrd encoder incompatible with delay
|
expand
|
diff --git a/libavcodec/encode.c b/libavcodec/encode.c index f7b13c8ba1..f66e2f9ba8 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -194,7 +194,7 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->codec->type == AVMEDIA_TYPE_VIDEO && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) avpkt->pts = avpkt->dts = frame->pts; - if (frame && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) { + if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) { if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { if (avpkt->pts == AV_NOPTS_VALUE) avpkt->pts = frame->pts;
frame is always set at this point for no-delay encoders. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)