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; From patchwork Mon Dec 13 13:58:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5468280iog; Mon, 13 Dec 2021 05:58:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwLd68O+t7dZBxuemYtEVlBDRNxQXBSwSiaVoqU56861iqxLSJ7HL/JZb0fUpuBrnQeBAJ6 X-Received: by 2002:a05:6402:5208:: with SMTP id s8mr63756607edd.394.1639403905133; Mon, 13 Dec 2021 05:58:25 -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 ho38si18721564ejc.745.2021.12.13.05.58.24; Mon, 13 Dec 2021 05:58:25 -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=pNZUiSao; 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 4D41268AF78; Mon, 13 Dec 2021 15:58:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2051.outbound.protection.outlook.com [40.92.90.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0888F6801EB for ; Mon, 13 Dec 2021 15:58:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lqa94BpPB5bwqoQk9nzMg8K/5RiIDtQ7pJMJwjTQGMToLpOTGGeQS/2HADL0O9ae0b06tznWHEX3AnHpc2q4bz2fDqG1frclSjV3sN7ELAYk8YfDnqfzRX+awaUXnFSIHquPPQhuzP5w33EHVaGPm+3asnEiv7+9Cf4FdLmYuMFJ2+b9EW18vuFsDDkCvOAIDp+O8xSWk/dlMnu1dk0T7gBmjji2bFHuu60VhgqYJHNhJNOg+kRJQGDA4w1kEhPt/A2xANQAVG6gOXprnr1znLI2eFYE0DVy+IDg3I1qcWDOdGy0UuQHcQj2TtbOBjp+kqA3EHD3ya/nCM7mVY3wEQ== 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=cYX4MBqsKZxxckRtdK5cJgN5s6BdY0O7hdQniv682yA=; b=N/o9lgaQMbYyasoRsdlkBTBhoRpY1+OhFGwHxDqgdDwtUIDCZoJReEHFdG/jTNgsynQIyDHMj8mwA+xUuqLwoLWEuNSB6Qm7X58Ah7yHGuB9Yps5qa8kM3cIN8jIGihLfTf3vqRr4ND47VRzOPdeFloy41BoWPC18aysVXSCru0ZapPJEiHRVgnU4b+7iQVZO+k92tEDelC/R4IZOQNkPspcnBhtFpluXzdG0nqnhmsaYGziA81pvFBk18oiWdKGqkgUolOuiVu0aE8k+0+NhkxTG3401gFRTvNChFB3GrQEiV8IKTG4qSRVSX9jIt+eHibw50OZR+27LMn7moPsoQ== 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=cYX4MBqsKZxxckRtdK5cJgN5s6BdY0O7hdQniv682yA=; b=pNZUiSaob2SNpigbJSgEDxo2gp6DoLby7TmJyqWMmsGyey+rJrN0Jt2M77g+qUHogD0cnQtuTgQkgCHOzhB32d2yA7DfNJf/RrLP1ueWmUqdDlVVinc4dM+bKN3VOCmgViY+Apq2mErnVVjNb7UAhlNf3xeK7Uujfr0Y+VpDudhw75MSDn8Asqx0B3RgrJiT10wbyFjnb7lhtKx6b1juOli98p6Cus2vka79UOlWZCm3pYPqwxpZiVBJHFVnjABfRPtAc421zS1Wmn5HDt0nFPjhqaHLWFC+UZc+DFXN6ZZ5Z5LvA5FM36Q5dJapuC4wH9tnsdvfVAGdvoSq9C8Qhw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5251.eurprd03.prod.outlook.com (2603:10a6:20b:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.14; Mon, 13 Dec 2021 13:58:13 +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:58:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:58:04 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [/gDVJ7n99IssYLcbjRHXX1c4KLdPFsMS] X-ClientProxiedBy: AS9PR06CA0232.eurprd06.prod.outlook.com (2603:10a6:20b:45e::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213135805.1926941-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8c8bcb5-17ab-448b-b8e0-08d9be409ad2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRmQk3JzeNKq9EEHvkF/P53RwAgzR1sHLK5OYQBvjNTEVsZaYiaiWuPKkJQs8s5waE6gDpRmtqBNL/uLz8TS728qKn/c+eziaROrFuwDo6kYI189cKz3n+Y6wxCFuFDiYREvNJB53gnzz+en9dYVp94Nlg8HtPYCEKzLv6d3WfRD6Ux3+huiYTHDDg2oXW0tAdhoqJkKys/phYUa3jXboFejSXVLYkYYwjPTYnQmpuTCLGpvvHYCCTbDtHn6Ntyub08PT5OnyU/Zd+TSpZ8OfS2EOlVdp5eR3O8azOGGqxRiB4XEZCq4L7lOIH7VyoOFOietrxLX0/DFa9mHWOGc3RRonBg1pAJzNJ/euLGbhpsc8aMBQamCsDUcaJmKg9cV+23N/R4+ug349QDc08zDNzYv58/BY7kupuh53IWF7YY3Wie/ErqgxPbH8rF6Red/ZqByFKQPDrybP7ZNxPgl7SCpMDFjRZ1KR3+yoxDdGgNYJLkluftiK7O/XRpoTcF03Jbesc/46cd7gZswaEcQIWlfaZicYH62uCc7CrzPTtOfD+pdccWcx0MdguGuETux0hOZPTEtvZkB9bAhXlJ3Kh5OkT8jp3dfs/6W6b4s++qKBPq1R5SVPiWRYsyj+Ron4tRki5RkuHy2m7TD0fxEnSb0twCdXLDNSiIjuiDOboZpynDZq76pNRvOY6RBG4KKYqbD/jwGSLTZHMu1fA0btCo3ulcw4RpV/3qSigTBrLtdZObM45Yisy0skyGQkzIwQk= X-MS-TrafficTypeDiagnostic: AM6PR03MB5251:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t1DRFd/MVE0xyJgB7b+v5iV+ji+ASv7RZrm+ZqWqGK/KXepsPwljKxjvd43HOovJnDjbSJtInY+0lvM4+YyzYl5lDmch1FiBk2pkm1sDgp0eqvxeiSy+oY/Ah/f6+GsB54V48RRbXc+jlIJwHnfhQ/LOKw6U9L/yIKBwiWXUtGBGGx+uai35wlapq84mmhtRErHwclO+wReGWodNfqvhwgkwj3qtVpvmOXkw0A5fIJq7B+xeT9/HgLgyYEq4fypV3yUd1e1t2TPO5U44qmcIzGR05D2/sBNqGsPUDwDLEeyGbJm7hEwyjx3+XZzuJ5eAPeaBd3Rg9gc9ecWTgb60Rxl6O+mpCoHwCijed9QGC1m+xyCnylXXUmqLxXfCvMevaEOTDBAk3l1mj06gjUuiodQ3gdum75/azKbOJREG7QLIytanGNLx48ysfxhzeNZ9lQtQQHOtBsDbyzWwsbNfC2Ks9YGSoVnvURkWVGjbtyQU2zukNXFNLo6Br9tK7e1j8Ga5i76exzkow4Gch+EHTkJNq58y7lAcLvrMVsZy3byvefPmc4yXi9Po5BsJNJhoCLlxe9glmueXmOr+1C8RbA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yD4SMIJuJMtsBYBI6+9ChtGroja87gzAFYr3M2iE2kpkXsRFUuS/eZD/Ylo6YZSykBeQRtjBZw7cigYfKt9AwbHAZqESvpIY+pBFEcPYom7cjjagw7gUJCzFoGDmr0V3cVb+hy8oyQA07GEMFlK2x6uQ5rFULM168aa2skBTudanaOhPc9WNEd3QM/8pF5Y2uK56ZWfoRB6Ccl+In061GIDromKA/j5zTn8jPImhgEiZyjjkKebCNNpSQBAPT1+y2rgbZittShSpQZuB7xlKqDkVXCLgRgMNex9Lpwz0Jx7ECmpNTYI29AuA2AwPo2VQV0TfLwdbHZ0JoE+9Jyahjaw07NlsTbWP5HMrFvnoPeQPB3o8km2bc0hC3nkEDPRvfkEsnJaUUjBjqIKSYV5qc7QosSFz5YTBDvVIaoaZxfGK+HBsGVJypNFLrZ7uVa48C9FkSdxglfIs45dy/5tUfQC2oJ/KM61vyPY3Vj86XpEgwKK+d5mZTW5ZaBJnrDxmv0d+g549bdqyU7AJJw3854yKcKu2KFq5b7IZ2oiANOZmiCEgMWs/2CmCjy7qCvYRlSuNRz7nWPHlAzlHNu2iSv/WJ4zCfQWLuqRFoNjpZK6gReQlwSp1UeV+2pLl1iuP7zDsey7+paGyM8RE1y/2OzuCO5WQegsHLXO1I1rdPQJ1iqdd502fP8kWQC8wHNUZO/fYlYzeaOEtXnXgTDbFH1X3mRa5+cJvVYCtAdxbz9XQ1k1Di0nOrxrI2fcSV0FjtYDhZhBLa7Zl0sQqpXT8fv9qupA5L1klkAAojIMEpzep5nvd7csXxTYcFeo6xtSb8i3Kyu6FowY3Tjj3PkE5echV9NuvJmp1plwDPTeN2uZHiAbMjvAyraLHOaUDufPqvUCwu+s+G/LOBS4nlN5HsiR/ymn/mwGPpY/PiQF0ziFKwsug0IdSuCaNHKYXtJWeWMexc3IgQpIiVlccgBbabg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8c8bcb5-17ab-448b-b8e0-08d9be409ad2 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:58:13.6820 (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: AM6PR03MB5251 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mpegvideo_enc: Remove some impossible branches 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: FWOGD3cWT4AG Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4adb95eca7..8865e38293 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -885,15 +885,16 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) ff_set_cmp(&s->mecc, s->mecc.ildct_cmp, avctx->ildct_cmp); ff_set_cmp(&s->mecc, s->mecc.frame_skip_cmp, s->frame_skip_cmp); - if (CONFIG_H261_ENCODER && s->out_format == FMT_H261) + if (CONFIG_H261_ENCODER && s->out_format == FMT_H261) { ff_h261_encode_init(s); - if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) - ff_h263_encode_init(s); - if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) - ff_msmpeg4_encode_init(s); - if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) - && s->out_format == FMT_MPEG1) + } else if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) + && s->out_format == FMT_MPEG1) { ff_mpeg1_encode_init(s); + } else if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) { + ff_h263_encode_init(s); + if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) + ff_msmpeg4_encode_init(s); + } /* init q matrix */ for (i = 0; i < 64; i++) { @@ -3695,7 +3696,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16, s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); s->qscale= 8; - } + if(s->codec_id == AV_CODEC_ID_AMV){ static const uint8_t y[32]={13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13}; static const uint8_t c[32]={14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14}; @@ -3715,8 +3716,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); s->qscale= 8; } - - if (s->out_format == FMT_SPEEDHQ) { + } else if (s->out_format == FMT_SPEEDHQ) { s->y_dc_scale_table= s->c_dc_scale_table= ff_mpeg2_dc_scale_table[3]; } From patchwork Mon Dec 13 13:58:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5468496iog; Mon, 13 Dec 2021 05:58:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwtohNyixLcM7PQWupPy9Ff6ir98CY1anYw26zL2nBnI/hadcfyVTCQGCV+dVFKgLH5uYAN X-Received: by 2002:a05:6402:1e95:: with SMTP id f21mr66716449edf.139.1639403917188; Mon, 13 Dec 2021 05:58:37 -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 v15si14468828ejb.737.2021.12.13.05.58.36; Mon, 13 Dec 2021 05:58:37 -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=H9Rg+gQP; 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 45A1B68AF71; Mon, 13 Dec 2021 15:58:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2013.outbound.protection.outlook.com [40.92.90.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 886356801EB for ; Mon, 13 Dec 2021 15:58:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cVQrXpOmopzBoTSmmWuN7K7bzwDXiGGgbqE2hoUHJ21BX5Xj6tXfURgdgpka0PIEAnhaCOL9/inrObocb4VL+TmSDx76lFXLgvBZXNMEAr3Q5nLqbLnk3ShoVHf15vrvR8Cj2IXqAnUIwl/MaYTpkVDfTbpPc4s4VKqOA6nbDPO2FW7Rkbpx+rlnBoBk295W2PcZ6MCRVcO2FCijkRn6YFK8nfBI81fm/QtbR5L94kdwDyG55hdJhKlfkwFlg4bcpAesr9eeuIh4xJXhDaBSqYX1KclxpnnBXIbVp7b3JKhl/4WCMQQDZZvUhrZIEyESW5mSPHYxzS2epZzkBV+SOA== 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=ca1MlGRQwrGQpcFnh1jbbvg199ZKIIV1dJT13gikkLc=; b=UgQe6+XYCRqm179alG5Ff/4zs/L2wn9rEIubFYIR7sEEQPm8hBba3gmoZ4G8rbiAyLRsYloxV1DhwVCkF7OiQByYKClWHL+fmqxOPRdnSHxRixhqe3qXp7J/cnhRXdfRGIuUlHXpSzUOuxx9T3L9ZaH03O6sN7JhADuaXWC30FjW9yugDJmwaL5Np4axWzSEkF4CGqjhXDdpf90HxWYduH3g//apfyGUTp/RITDaNFo9KkiprLBSCmgeyBzRYZby5wka5U8LKz7fFfsMb0RQDeuQo0JawokO/OkI1BEgbqxHq4FBeITv2olnyimfzQUBA/P/8kFJpxRsUQxJo/BMEg== 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=ca1MlGRQwrGQpcFnh1jbbvg199ZKIIV1dJT13gikkLc=; b=H9Rg+gQPRaUPgnoFndAr7iTK2nRkXfSbwSQfVFjVAjwCC3W5s4x4DAkcO3aW5Zhban+LazphVuUdqkkjRpagYjyqY4TnaQ+RwIR5YbBU1w2tVfTUsoAHLRHJp+tR4kHOzMmCSCRW4iyEj0G4kQ8x7l4aHpd4g2xqcEnaSFJQTIKpiqlG4csaS5oTAQT/+hPqE4Urou7umdFiZNECxX+nYRTCx9hXfDe1uY88ZGZl4y162718khbDp0IncsYLztB7seQ+y+IRU1YDh9M7uTnfHynE5aDQZolnqaR0b9CsBsw8irapzG9fqhC3BvLb0zV3cnkhnZwgRB7pffZmWWPSrw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5251.eurprd03.prod.outlook.com (2603:10a6:20b:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.14; Mon, 13 Dec 2021 13:58:25 +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:58:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:58:05 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YD8G/myv7qI2dzyCyYH+Elf5nulMxr8W] X-ClientProxiedBy: AS9PR06CA0232.eurprd06.prod.outlook.com (2603:10a6:20b:45e::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213135805.1926941-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 117ab5e8-c6f6-431f-1fae-08d9be40a1c1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRmQk3JzeNKq9EEHvkF/P53V5DWnaWlQOwvXGTQOQ+y/bZlGnDDSJJSrgnjajiq8QJb2RhBPaWiF6G4PB1g8YCNCyJMhxb1/KZgun9WjxC5H9vuEA5aVXdqVY2Wb6OQ7ujapKeo/5FGclVr1iL4h8LWjZcIrGTsjSVAQdq/WdixbVb08cIp8VneO7iKlwHt8xPa/XS1EFXFsKm4g7pEMHxFHCcfahqlbMHAiITMzFpqE6Z8i59te7n5tuA7QQGshJiGQcbAs1LkneDPjKQXTMzLKz9wzdIpqD0Dnavp2W4lF6ukuoOIAfUtqie/ZqbXg62i+oyvp8fMXdkh3ahLvVm26cMCIU6gUsjotkvxpfMd6Db2gMS95UPBfJIqfLjqmt3+wsP+9ParpAor8bTniQIYuLPJ2ZBeQH2YFMMXXN8C4efIOFxxIiDbX8we2OI2sZc+yzgEZ+FWL68PQe9Ydi4VJOweqB3S4I54CKl0fiaO/BWs+sXgsrgCJK12mwsDP6jRKYYPonYcrJFoxr1WHbpSJfsB4EfCbrqO20s0DVZQzMoZOuU5/ou/ukQwLVpZqNN83A6wmNY9uk+oNI252PGJISUoS0D6d637pySZX1W5E3CGPdz8B7D2pGbxWWY/0hZ27DXRTHqfMZ+yTAdtPPjdqZwadrd2nza4j5yqCRh50MHc+BSkxd7ibHU2tz1C5LjXpSrJ8NL2QMIPdhOsJw3k4hC8dbPucpIPW5FL5wlHpfA8nigNrpT+F3Z27Regxq8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5251:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sDjWvK62fsXbOp7zUqKMxHxy+l1AnsphHp8stlR30l5jLERepmbRbBFJF87QHEC+Kt2I8JcXNNa0CmlSh93pLVppBFsSyWrtp/GVPqu+xYGHMhTIYTCMoJSz4wQXYVVY1FbkznOl54LdfeKTOmwZ4SCiJCkDAVuourUdfva9eDfluIiZtGqULQDPmR3++LgVAgqrUwU6FCE84WGso+qokyotCQ0HQwaAO3dUmwBNsQezClo8PfpFtr7ap314FS2t7eV7QU2fMdIib0MoGwQMao/LGbUgQ2qhPv84UZCYGJCe2mddYnAeQs+bxSP9lOGNmliv2VPHdemL0/Oj+iMCdlmRoVDptw3tM0vjLRv9/csm3T6uR+YqBnAKVu3dLzY2aDU9b+m4JSVq7pnzcSuso6a1cGhEKI9rRkVWesvLj5TI9xiwDsSp7DZ/19MuIzwLlTenQp04X/Wg+lSiFjjn0fQuaU7gHXCIgfFd5tk9XlhAzZh6DwQwfdagYvhtkL615q21OwIp36DGmkQVFPqyumD3g5Aiq6NScpLgr7nVrLKrFP4Bf31pTm/m7Qu3Wl44hqyVjsj1FzalBbFVIznncw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 25K1hiVVCdx4glA62KToIrG7IKl1CGuKFuUvYCAWWOBzc5yVYITcYVTWZqUTSRAUs+MFhAwsGkyBWkFIduxPJ25u/Ok7IQHX9P+wSxr0qZ0F1oGZ60JZZcy7nzO358rXzGGXSPIqLAZxjGvNFa3osXUCcjBSuKDfc1YNNBWxDE8im7FrzR+aWaodLjPNqus4itvDzvc9POfOeEK0I+CP9hFeEDPzVoh9QJkIBDanyZOjEZkvNfTCs5PKnEUNm+bQbp8VAOjfIcW+as4cFCYgm9vvZ0UotEAthuFptKamiAwX7eRUp0pOoVdWwhqbRm/gL+HlIuwgeDhCd4fxoc1QwSUARq14QfFSo4BuOvZCbCIOpLbOUZXNZZ7xeUZ72ecvl3lhFDBxZPE4+l6uOyCUxSjS9gOSggfUhVi+AYEY9AFNPHXjHgVcR6wSTXHW5kOWugIL8WtAeo/GyfmDSqz78gy166nH23SJDLr369pj37mDo43S0+2pCLRMt/+ZjWYmMeijrRNVSJB51NKFKEEDWHrSHOiVk3UNUE+HutVvWpZ4Y6JHdscBFkZUBJv7bDPnFD3qS3JIrJIF++tV5n+Zm1v34stIRX1gacWzGz5ztBe19uJ9sIQ9WUs0vfg4cMVYGuaEecW8PzpCsWkC9oSEyb+8n945x6DRZ5/WtMlWFkTsTqy2gBEtYZVb2E/A0OftofiGN6ncGtnlhERBEoQaGynd5tg4m92j929GxWrYIyIlQPus4PHTw6Zy5uVu3Qv3mtLymUnwr2kYnF9ntsDEAZFvk7e60HK4AhgDITejEhhlaYbekcOmwyD6Xv9oKOTex2pnq8aYRSaos0uW5Ifse/uL22FBsJWohNMHmIk7QmkcK7EFHMD0Z30CrBDYX2dSE9JM/5761p6hrk9NtTkKYFFecaUrDUbnxYsS/rJVnHeIYgrbRlNGuRwhx0P5KiPbtEZu9q87+9OOe2R6znY7og== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 117ab5e8-c6f6-431f-1fae-08d9be40a1c1 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:58:25.3055 (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: AM6PR03MB5251 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mpegvideo_enc: Reindent after the previous commit 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: deNW0B4bjnHI Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8865e38293..128d1a327c 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3697,25 +3697,25 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); s->qscale= 8; - if(s->codec_id == AV_CODEC_ID_AMV){ - static const uint8_t y[32]={13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13}; - static const uint8_t c[32]={14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14}; - for(i=1;i<64;i++){ - int j= s->idsp.idct_permutation[ff_zigzag_direct[i]]; - - s->intra_matrix[j] = sp5x_qscale_five_quant_table[0][i]; - s->chroma_intra_matrix[j] = sp5x_qscale_five_quant_table[1][i]; + if (s->codec_id == AV_CODEC_ID_AMV) { + static const uint8_t y[32] = {13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13}; + static const uint8_t c[32] = {14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14}; + for (int i = 1; i < 64; i++) { + int j = s->idsp.idct_permutation[ff_zigzag_direct[i]]; + + s->intra_matrix[j] = sp5x_qscale_five_quant_table[0][i]; + s->chroma_intra_matrix[j] = sp5x_qscale_five_quant_table[1][i]; + } + s->y_dc_scale_table = y; + s->c_dc_scale_table = c; + s->intra_matrix[0] = 13; + s->chroma_intra_matrix[0] = 14; + ff_convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, + s->intra_matrix, s->intra_quant_bias, 8, 8, 1); + ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16, + s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); + s->qscale = 8; } - s->y_dc_scale_table= y; - s->c_dc_scale_table= c; - s->intra_matrix[0] = 13; - s->chroma_intra_matrix[0] = 14; - ff_convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, - s->intra_matrix, s->intra_quant_bias, 8, 8, 1); - ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16, - s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); - s->qscale= 8; - } } else if (s->out_format == FMT_SPEEDHQ) { s->y_dc_scale_table= s->c_dc_scale_table= ff_mpeg2_dc_scale_table[3];