From patchwork Wed Jan 26 23:13:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33877 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1942473iov; Wed, 26 Jan 2022 15:13:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHp47gcHH+FBnHgBbnNFuKkn6J0kKQWT+w5SfJijKhhqOKgm6hrMl24g20mXltHLnNvx2E X-Received: by 2002:a50:ab1a:: with SMTP id s26mr1109940edc.85.1643238817405; Wed, 26 Jan 2022 15:13: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 qw36si415529ejc.200.2022.01.26.15.13.36; Wed, 26 Jan 2022 15:13: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=ibpdHV1l; 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 2744268B172; Thu, 27 Jan 2022 01:13:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073099.outbound.protection.outlook.com [40.92.73.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4EB868AF00 for ; Thu, 27 Jan 2022 01:13:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IbM4Gz/aUOKqHliKTyQ8rexzsmyoyOf6BG47cZJnPa3q5H48WgCpHAVq9nKmvlBvqCvpEgkTmMAg82hTSqaFU98G3aTNIbjrzcvdm0jHA1OhPyYJxGgLpJq9ef2jj3c5C6ubAMmYoRYlNXJqGu7o2Fbxbr3rlVV1WSyBvPVL/9kGGrKkdEdHoGZpRqROd2MZPYiqKXgWraP8Nt2V/sVeYfoOMNUK6CZIY463B0nX2btQnY/6o7P4pRWPfwkq16rymAmTuF90hfycgTgktMGvsJp+NiPE9oc/2Z8z9V/YY+QxmbLrE4gvnvmVHjmkr0EwVQO3rHNihE3TkXgsEKrt3w== 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=t13YRHTMarhN6O6Ab6sTfl1durCxHNZooBJMzr8gIV0=; b=YY5vBVwVupB+2h7Mhh0yvHe1CXPBxN4z90DE6UO9rpmkc206uYtK1RtFB1fkZ1lRARBqmxZydThUhpSqNm9ojI1eRnzAfyoFAoQN6pFXMDoLP5f1gcFRlmiquRkOe01xv68LqzzeENfCmO+s1MyZWahQaTQpWt4CNewOFwXwAtSpIXH4toydNA7zULfPNlD0O8122eTU4P5jJ/CkpA3uW3TBb+vBcDlzBD/OjuHnOUeQiy2vcYBBM4fE3N6ta2PVTukA4xT8FOcxW7Zk3eX5/P97u8c+Uk1SFHi/wD21lk9sHxa24yWgtouV+Z5knwp39X27/H+zg61M2vrduTDTIQ== 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=t13YRHTMarhN6O6Ab6sTfl1durCxHNZooBJMzr8gIV0=; b=ibpdHV1lrAZEYROk+GpnjCZ6kRV2TIreB2gtEn+kGLOCw3Ev0353qzIonXB18t7crNzGHgh+pEuqnL8YVYg7adJmiZEDyMIIQWf7/lPOW8/47HcnlFGqhL9a4YzWmCoF5YAJ8eK/ZbD+ZJglZYVZs7eE2fkqR1dLx1UK9n1tc+AF+TRf4GDj/NFkOXgsDQVwARGC1SG+8Oi+P27zXfjklZgJyA+uEqEQID2IeybDt/PPtSqRRm3UNMz3LG1EaVUUaIocsEn0/QPQg0Enxmlr8F3FP7zri9yfALJyKTUPq6+bMGvOtVKZ9fH2zu97qo8SXQOZ1m2dvWSfAfEYvZtSSw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB6209.eurprd03.prod.outlook.com (2603:10a6:20b:156::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.19; Wed, 26 Jan 2022 23:13:25 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.017; Wed, 26 Jan 2022 23:13:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jan 2022 00:13:17 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [1lUt9U4psYLMCuRbPUL4LY038qlwqlBJ] X-ClientProxiedBy: AM6P192CA0022.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:83::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220126231317.1919111-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a05ffa23-cc67-4bf7-411c-08d9e1217441 X-MS-TrafficTypeDiagnostic: AM0PR03MB6209:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aAu6EA0UUy2BQHwS0C9SClyjL+ktUfWx6XAOhx904eZyGP3c7T/0+LgeMG53dN9997TKDCJhygwSNPI4gkcnZGqGvq2fgCorHs9NEBLYY239TPZ/C8sCM5ECVaPS44TB9rJWXK1XqxkRxbbNvNF2NFpLpkmFln9EUTUkOREvUMSftGUe6G3F/HrNpg0l5mWmGYrW/bNsRFl9qbj64PUibxrl3GfMcoQZhGOVUPjpfztEKifn3fLWZUvA4+8LGwkiB7wIJHZA+cfrVF3euuEbJ+XHVtkELF1J5nJl409yQ6QfmWlvEEMq5C3wZdOX7n7cADZtCTVY9O7Y5uEvCrYkNHmRS6bd/QATI08OAtGG0bykFqOGl7AotEm9d2d8+yIEKNyNtIcsVQsDcqnOnVsRI0ScdphZDHcABFuyKM22fKDx3qXEiLKDRUpVggGHdqW7irznxKYiZ54cFGb6XYAi0XPmsSWHrECba3ANF5OcG+EXzlvCNyINGH9nnZCx5RWR8wwsVVGJlMYNwhEmj6Dw/Hfrjr2xiJYeR9uTa1dU9wlFAZUWLUecN/5piUqdCANp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cXbrXe4ueatwed/Z5R/zd0A+GAOieeJoHz0pZZ8f56aBuqyBjlBqiXbTn0fGtIkL2gLI1PSJwx3fq2qFZWOf+TPPAuwe5Y6970dsC0jI2/x6SIrbvW++q4xbH+rQ5sqNnylVrSAQwvBhfjkzh2jL8/CGrq2AgKOcvQE5+qrR8EQdZHdTmHq0CKBGEP/w4Y60PVEW8Cd1r4oFC2miJQOt4jAi+gEsA7UTJe6GNPj3Lede84MUhOzLqjZoEy5MMiDH62i+ztFWhVZniIoN1wnttTbwcMHu5MBGTEooVSnt4qtgp7M4HHVjWEAdlC/pnSRa+0uEXUa5Ui10EpKQNY0DegEqYwa4/P/3xPl5mrwrVAXQwn8wUYAfP49xvbtce0nWQwSPpbcglE//ljVnB9tzhUgxTb2wmnR9/6IapN/tQ3sQEIMlioeZ0OV5MHsCwJgRoDzXUq5xsgoYPEJ9M2C3Lyg2p4vne7KxAlUE/YbMaekQ/vnWZMsZzXfE/FrbJVRFVkJ5qaVniMSAmT+f/Ga97nNrvpZdxBGZ+DSy746BkXQrpg6jilpXLQs8RYxsCnuyDYyWkfJIhgwIZG2WlCeNDExa92q+WcxUCXn6+tNkxFpzAc6TvdOzmJVFVIezt3r+QuEckX7F2eyD5zj3dZdULFQEMF4rdqb3ClyuI6JA4509Nk9CyP+7a8faqBnmoL0WmKMXk4ywprj8aM0sV/v1y+xtB+Q9YCTm5fqKTmPq5v6C7jG37bCS0Pt8C+LcE2jI+874NgYJVSQCA8IDypTzRNVaUOz9DnCie4K8FzGD0s/ejS26Zm4M9DOCo82XIKEgxVLNNnXJIDWKyxQjcXXmLI0p7InwoOe63CQxAONXgiPdZ3TuPHIPvYVgwVDvBfLllQPYWnXCmzIcmuTSXJ1JbfS8vQ2c/61xVh2CFENSGM5n1mi00NjUeZTomSRAhG5Xk2VgKCGOK6sUtVK39gk0qA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a05ffa23-cc67-4bf7-411c-08d9e1217441 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 23:13:25.1489 (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: AM0PR03MB6209 Subject: [FFmpeg-devel] [PATCH] avcodec/libxvid: Don't set AVCodecContext.codec_id 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: bhhjPIpMbOZE Unnecessary since 2325bdad7b67b1c8539ef6beebb99d3247f08669 (and crazy even before then). Signed-off-by: Andreas Rheinhardt --- libavcodec/libxvid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 7cf9d7661c..94746d0bda 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -657,7 +657,6 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) if (xvid_flags & AV_CODEC_FLAG_GLOBAL_HEADER) { /* In this case, we are claiming to be MPEG-4 */ x->quicktime_format = 1; - avctx->codec_id = AV_CODEC_ID_MPEG4; } else { /* We are claiming to be Xvid */ x->quicktime_format = 0;