From patchwork Mon Dec 13 13:55:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5465781iog; Mon, 13 Dec 2021 05:56:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhYAXiBEni1LNiXam2DvJuaYtZA3tMLvsYPOUhbHGTe7lTa0TxXOn8yfnD99jOJH8ygzLA X-Received: by 2002:a05:6402:124e:: with SMTP id l14mr63020989edw.74.1639403762477; Mon, 13 Dec 2021 05:56:02 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf31si25566528ejc.782.2021.12.13.05.56.01; Mon, 13 Dec 2021 05:56:02 -0800 (PST) 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=hEcO84ak; 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 01A3668AF57; Mon, 13 Dec 2021 15:55:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072046.outbound.protection.outlook.com [40.92.72.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C01D68A2B1 for ; Mon, 13 Dec 2021 15:55:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aA9CYmzy4z//4eg368GbHRGxYGOVRDEq3S/2dirzVYDC9eHBTiIFx8YDpaMx/uOMH192RXNlExVKXpUWEyRW41YihBrEw9+s2Jtmjb0yEeDJa553M9PqayqpMyK9iJLXk6666TCjDdYMaB9Eon/iBbcpssyzmhKg08QC8QiznSDliCv9PJ53NL2sbiczPHv7Lff1cko5HIglrwz2axH9FjuUY+xnMA0tw+8uDr67j+LXkzS2Ip1gksxlEHH2PKfwUzH2wa3xaQuqZ+SK9ipmOVVkzbPSVleM9S11+UWXsx8fCng5xfoi48krMJcR0rSYhHI+Um3wCzckx29BMvz69w== 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=xdSSjJSMPWgABEks3mZ+7XW+r0arIjGemZD1fMz5c4w=; b=ci+atS90b43Be3aYmTy4J1GhzQ/VLrmiUKwiZ399OSfjntqAPUftcY7xZXarNXogbFtpJXUU3nCmjBii46fzV78Bw8WsTr0WekHYyYROjpadK30v+HAfDD62rMQqI5x0nyY4pTZIeSF2AgCQJZ3Y++tF94QwSZ4iup9fMpuJJ9gux0GvvoD3TFl4hs0lWVNTh5/kSDLgl5bdSMETfNzTGXRYHAg5UW/a3RtAzg8q1v3Z+eisxST1TRjQ8ljp/xgQ5Gkj91Nm9w3feC6uN2W1xL99MqZWQ2MnQOoYoOnA6nrD3GlGxwnPwQDm7brRvCwntlFlyFaQtJ5bVo3mjT5UOA== 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=xdSSjJSMPWgABEks3mZ+7XW+r0arIjGemZD1fMz5c4w=; b=hEcO84akYQx721W/dHxA41+B8d3ZM5oOVdfw/Sm1MxvV/D3fTSZ0RExYy42ZU4YF+1nAz6OGDOtDdAD/gZgzdKZuVjm6RitOQevzhzml+4Zimvb//8pcP8a+9ucoXQ648fSyOERVA/ZRQKP0qEtalQZLwYZRl9knTCqxTjbmRYooKb9yhD4+KVmXJ+y2ThgaqcnkOnZ5Tus013b+OU6I/YN87x7/5ayYGkdDxHnd6tGCfnMALuloIM0eyBMArRMV78OqUUMPOWr2W1HNK35A1hlwdr6kT6NdYxwW/PrXr0sZmjZKdYaYN0mCgaPy9eJgDATQ0LGt7A7T4Fdvvqsjzg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4375.eurprd03.prod.outlook.com (2603:10a6:20b:5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Mon, 13 Dec 2021 13:55:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 13:55:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:55:39 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [Ag/aZvicMqkFUWrMjZgEyNHZPTGvFfBz] X-ClientProxiedBy: AM0PR10CA0046.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213135541.1926858-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1852ba63-5f43-4fc6-b1f4-08d9be404475 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXIGlc7gHXb8VKB6nAC7m+/CtOK0PrmWGCNZxa8uh41G5J4BYdVzA0p3nkwgmNp1+sfcXXjeEqQvBx4oGTFbZ2zHUrDfnch6v8WQE7DWOliQZ1JyeZByX/t8hlbi/j/1upO7ppRQx7iOniudGY5CJ/4bC+PvgmbKid5HZ0mUgu3l8XkmXEG1U+mINXUqqjbmYmvb1WNFLTDVc23EG9FrQT+zGEkZhBVtoEk0jo0aWfaSRGT8rGnMuxm8Vm4AHI4y2Fr8ZNgD3KudXCHAnaeWMmGZzGXIBfGclTKnftGSlUB5F1/0rkCMgqZQsVTH3GXA8mUfhYNu5OZU5b3dLpqlMsiwKryJl1OrogIo9vUW2nkpnwWT7rDCF9JqcuT3lhxevrzyO20kzKU3ClHaZwgViLNhBDo2RgBrQ6Q85SIhccRrT4JYsGmr1p3CuWTsfvXc6GhEZM5FCycynTHKCIy+yi9BNFOW32xAanHSp6tC8xxfLuKXz3abFaqVYwWhvV3gdR5qvw/AC3pcjkYsXnfR8Os8n1a6DKT8pQhLXPzaSMwuvAj18kjIc7IstCBXmAU5E5owB4BU5BFJLSM+MHpHZK6yj9j0JKzH6vQvlFa4gF4oP8O0lNr53+B5bRqhj1HeEvPQy1HLCo4EZNc1OLSKR607+zZemrfog1wAx1ESxFDkWE3cODFj9LK8EyIzfn3AYGhjQbiqX0RyUTDcJ0SIRrLqXgKU0QxYhs= X-MS-TrafficTypeDiagnostic: AM6PR03MB4375:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xR+ACvkPfPHZq7KnEDqotr0M3qq+dlrU3+6bmLaQPjHUigV2JLH1mU7u4UHSk+SkBdEt74/OMVA3rm0IhhCSvkvhaEwf01BvwEsQxpWcQ0KUntr8xUj6gjRvSawkm5JSWHITFBgKi45ZpB3w4XIj34HVevR0923g7SzHcZUMSL3qlfRImsPF6fifCIdCNMxrxPQK/LRIV36baDCegaoqlrygMvpVm3ukOu4J5bJ/vuN7RGThTJwsG0UUJLMC3oH3s51omWiYWcsMF9XkPv6f88EKV2uthPpVPbq2PVjkj2QPLhNFe4BEk1RfPWNyri9BZW/oMyIQwc9lpFkZEQr4KXYmwN0v9EkF4oPP6xHuA6gqF8vy5BOBz3uSSPbdvvxeurK2SY4m8LFrwzJ4PJPOCN6U80i3LmXDLnomp4G2L4kZjUFkpVFobKRwizN06lInyTNlmdFvi2bKDb07Y7aLvKKYZtxNrkMqt42h3S0qXV4Iiqk8CewGfGNA+iHAA5TqK4l7gWJh3jtJKvFEaPC1HOFEnsUwC9G2JH2089qvJ8UcxEa/ezfzs3gRTrXzjb7/1XPCXsoeOC7VhV9VAz5NGA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ikntJvss42Vxy+X7i87kthCv9Rh8wwu837Xuikr2T/qoU+myl7rl115sTZ8cNKI6hXk0AWQm1nopG3aDUUst+UfULhgMvnL9dG8NKMbkw5MTFJRUVvySDTV296R1Y4TOfP21Hzlgbhpb2Rt3WzCyvTooFTBAoGM0+aHKDuz8CybeNPvtQmgFJs95wUIF2jrkKacYZ1vNHc0TVrjytgYmsSkR3lSjsxAaMF2rTs9CC9eB54YfCnoeB+nEDx1zp61ziiDd1FiW9ADhmO4si1OhidhfSu0jHVHnmaetXnp98FJP3tgHDTTap8ZPjt+fpcKgL5+PTLqUudQHbXgVng64rg5khGIud0NGZFKI5K0uMT82S6xa6sQqAw9goVFPBf/Ll9BnJU7DBgn9MORtmApsWER0zK9Zfx3EofJ6hWCkI7gJZ7FrDwC3CBVueL3JEQ40k1QbSH7ER0MHNpJOvKZ/TU9h0y3JL36RSXWafOviKYwaRShVwfNHOdVU6FSLvDRKGNzU4Nbn1DCsPMMuDiB+WNTK5fLVB0tooXYJRbSjgnir4Oidh47SnoVdsBzxa7hdV5yIWyflJAOUeqPAQ4U/n75NlcNLqvgZ0OaZM68m8OQqOn2vsUMNTFM4JDHbj02fWWqrVzPh+467qpGNg/h0Sn4KszQ5y9csYypuVgkiwzlgVgO6yBfXtC7TtQIsAyhxLTqIaR6J+7pGSImw747cj3D5BBC77JXdHVdfO3+g6TAvKsh3Fj1dz78D9ZHj/Uxi1ByAcWvkpAY8mDWyswqTMmmuH7pRhHTQWFLwDFzeC9liyQRMV3DmOPW1lN7fXcPqW9r80e8o4cOqwpt3b+cVixa7nJ16tgScBEKQo0KKRMLVpgtFh+IJlrokSvqfiv9RvlXZ2q3B7w38drHpUbdkugTWUNgEOM5g2Q4fmnvutyViytVzyhtpP+91pm8UP7FUCtMKQJPFm+gde70/MLllyQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1852ba63-5f43-4fc6-b1f4-08d9be404475 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 13:55:48.9928 (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: AM6PR03MB4375 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/mpegvideo_enc: Combine some checks 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: UI6KLdL79fyY Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d33cf9477d..4adb95eca7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3520,7 +3520,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) /* we need to initialize some time vars before we can encode B-frames */ // RAL: Condition added for MPEG1VIDEO - if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || s->codec_id == AV_CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->msmpeg4_version)) + if (s->out_format == FMT_MPEG1 || (s->h263_pred && !s->msmpeg4_version)) set_frame_distances(s); if(CONFIG_MPEG4_ENCODER && s->codec_id == AV_CODEC_ID_MPEG4) ff_set_mpeg4_time(s); @@ -3549,7 +3549,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) update_qscale(s); } - if(s->codec_id != AV_CODEC_ID_AMV && s->codec_id != AV_CODEC_ID_MJPEG){ + if (s->out_format != FMT_MJPEG) { if(s->q_chroma_intra_matrix != s->q_intra_matrix ) av_freep(&s->q_chroma_intra_matrix); if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16); s->q_chroma_intra_matrix = s->q_intra_matrix;