From patchwork Mon Jan 24 20:09: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: 33818 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15103iov; Mon, 24 Jan 2022 12:10:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNcfp1wcvZL4wrNo9vddgAAR0+3gfsFsvZxW952H6CcFAYSqxHBWrFbAPUHhgMjKg79rc8 X-Received: by 2002:a17:906:4fc8:: with SMTP id i8mr13798704ejw.427.1643055023128; Mon, 24 Jan 2022 12:10:23 -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 sb10si2198032ejc.658.2022.01.24.12.10.22; Mon, 24 Jan 2022 12:10:23 -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=Tz6R175j; 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 63E2F68B15C; Mon, 24 Jan 2022 22:10:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065021.outbound.protection.outlook.com [40.92.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 292AE68B15C for ; Mon, 24 Jan 2022 22:09:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fzjdBBMgjdJ9ZCggcLSlEuk4+/M58LG6NFVFKS33OiNVkUdmUEg8PWBRWkJ54TWiXFtgnI8L542oYanbNsOp7Jcb675Ab1lbhKBEmwcjNEBfGhMiEwS1GRwKHOlhdUNSgsEZyCLXnaI4MKvOqo8X+f2ytx81Pit4EroPeNTdhONg4F4PEGdnqBVxT7XLSW0n3VOASK3HUVi0JklfbmoozZ2hM547aw6KThm8KNDEB3E2f/QO3dnOqmsmirVMUvp4DTo51nCMqZXtcZMLMKWuN5fFkmLn7eRU8tAWJSh1xNb2SnXSVfHIYNE/VkFEDV/ZHnhJHpRGv1h/qSmPL0eioQ== 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=se9CeJGK8eDykpCllTLY3NHi7XsTiq+zD6reLPj8wOU=; b=g2u5TGAfGdprI1K+9WZjM9CbQC7D3u7pP1DWMrZJKLF8D5TvKqg9OBiSCSDdrsk2lOOjzcwGzOKS3BSmrp0u071v2SnNntl/1UurAoWVlFDyh9dKK6ncnwXdTabdJyikivgdj4oC27vh3L3/alfrUrQDQmE5GjQtdzwj+gI6oRKEDLbtcJ4G7ySLsNubHMFmgmD6pI5wFe3nSLOUUI9q5g3rJoQIAKMfJkGiUsF8bHb0MaDoaMkstDFv6hRzop2Qiebj/sT0rdwpDxrfthZSbZgIVIjFp3NpVbF7Mgm6tPT4GhDaG3mCvRSFvAesRjVusbV1TiuRFvkDqct2RXNDTw== 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=se9CeJGK8eDykpCllTLY3NHi7XsTiq+zD6reLPj8wOU=; b=Tz6R175jbGtZW1Is7uz+dZLj2uUeK+/h77JYsHHrypENEROmXCrdbz8kPxd9TGJ0X7sq2obOkdZ0vSme15q3pUDtMCP0ssh8MTjecJ+vgBFUIGWVOv4HWC+dMRF9DSYP3MxJgYOwrNHLvPtqZBZC3t2o/UIxmxZWwf+qhZWmuoH1BmhiMPQEXmnGH32zkAqkja0VsGSc9V/z06YgUNNX9TSTFiFaaK37toh1Rtxe07YbS2uqlqPYe4IUi5PzNzvOshgAFVC7ofJvewCu0BiUJxpsmThDOREjSkvi8jtakQH3ybYcGYcnJhVvrLoJb4C82a4WbIdbff6fz8X9EWoekA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0301MB2557.eurprd03.prod.outlook.com (2603:10a6:800:64::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 20:09:44 +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.4909.017; Mon, 24 Jan 2022 20:09:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:17 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [Rs6cKViNYesyQSsxI9PZm8w67h1TAc45] X-ClientProxiedBy: AS8PR04CA0012.eurprd04.prod.outlook.com (2603:10a6:20b:310::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124200931.593079-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ccfc6fe-1ee6-4ea2-8ef0-08d9df757682 X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PWF1cwvWE0ht808td9DEaGC8uXzV6xPjYpVNNXswRvPTtDtvLg5+/Jl4b7gL8JdX6LpFoRA35K63mMnuU9bEk4llTNI1kFdxdqtfmIpK/6zuoSGOvt7vrI5DGVSI59uIh7+Mev78w9H1Sg7OfoTnruPcD8GS1A0TGIIDBWVRl6GNRqsOoxUUEduQDVxkrhRJp2bJcURySFAYHSdL9s96SRuzbj0DPaULz52554KRVeUQ8OVe061+csKX6LfHa5mX17uPZLO1YAH+3JpTFy4DioJvMnzqHai4o8EfDIB/GRW+hY59JUnl8hnpwK85ipOegJvk/YswayCd24C/1hIHNpTIBKW/1d60kmomyT4mLziLpWvCLqPkVl1/OJkW+OuqqoL1lPualFVt0p6e+9BxL/i0PCwpwCPMntpYLJUc4DRdbuz5dqsJMT0/SeJDEb/gY2E2JsVNcT4h1PlxZp9r332KW0diQpM1rcmwst8JoF7EmZan1vXUBdY/Nu5qOoxk1T/k6+AfQFtqbwAzw8ASXije4m7oU3CJCS8NbOnqanO9oncjZwlqhy9xoYQkV2aHtGPRgXbiEP8cUEqiuma69g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 53CWKeJSFiY5vZAMRKOwi57s7irzrFC/Lfgy/jIY//LuzHbLC/LGYxIHJMqghNAdnEo2H4vaBsG5Us/ajEPhVGgrjpfagOe6SW86O8iaSTs5iEHaNmmHXYrvCoYvgctidLS2jhT8gXxl9R1iyskKk2En3P0/BbzowtCstvc9k4UgyNFwh43/r/OO4cycpENXjODeWIfX4y5/E7dB0ArAFP9hGxliJD53dDQr4Eyq6Sa0o6rE2aQPDKFqRGluh5iPsw8Wt6pjkR0h2J3oHqB0uRmpKbngUaaTQ+LZ36WP8xC+4lbPYR2+zG/G+86rm0A2RnFwJtztX7w52WixLlZQFpqJn8YZFasuW/LV5VM6tCggT0hAG/zP1U2K/rV23N9r6cH233XW5i45M50zdClja+sYTqGov8DFKdT847/b0ou4cHHwrr2xHJL77/KNFfbyWLAJpjLjMtIQtoxnwGvoQo2Xq7maO+U5JJPPM03DdjzxUd6g9IGdok33IwivrtGw3Adntf77CnVqlnz7L4SOvX/qulE0Oeu0FSe0ejgrDIS6+OiGNmfc3+rSW5Q9U44PD06OryaanwNvviPI/RARJ9k8ZTL4B9Rja0syBuAKfWIBleu7TshqxLWlxbFynXgiNZIzmynePHe3/IsxHsx3b4pqDfigxPxdcJWrnOLMKuZE1nrhRUlO1/fP+3ECvs8VSN7wldMJ1nyq9J2BY66Uhpz9Td8bmi3QN6zSXLcI6sRvSBDmOFCvirdOQscsaLrRnQB4y6alqUPDshoGi5CsFTLcRL/Qq9+qvcxmcnrxxW05eXmdu3itzGVi1jBL1x3mLFUW80yQrBVqy+bAeZXTyKmk+aWV/5HE7RYhbLUXa7fa6n7Am1+z/eHvtgQi+2K633lx8lszbDXfJc2WABZeY5AhYbcvC0sXebqMaylEYavSyzJ+jPzWYbPvsi+8P5rNHPwwp2Kut2vPcqHuRWJPVA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ccfc6fe-1ee6-4ea2-8ef0-08d9df757682 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 20:09:44.4102 (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: VI1PR0301MB2557 Subject: [FFmpeg-devel] [PATCH v2 04/18] lavc/h264dec.h: Move MMCOOpcode to h264_parse.h 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bKawJe9An0iQ From: Anton Khirnov Both parser and decoder use these, so h264_parse is the proper place for them. --- libavcodec/h264_parse.h | 13 +++++++++++++ libavcodec/h264dec.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 4d01620125..05732326d3 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -27,6 +27,19 @@ #include "get_bits.h" #include "h264_ps.h" +/** + * Memory management control operation opcode. + */ +typedef enum MMCOOpcode { + MMCO_END = 0, + MMCO_SHORT2UNUSED, + MMCO_LONG2UNUSED, + MMCO_SHORT2LONG, + MMCO_SET_MAX_LONG, + MMCO_RESET, + MMCO_LONG, +} MMCOOpcode; + typedef struct H264PredWeightTable { int use_weight; int use_weight_chroma; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 38a4e96e26..c7662f930e 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -102,19 +102,6 @@ #define IS_REF0(a) ((a) & MB_TYPE_REF0) #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) -/** - * Memory management control operation opcode. - */ -typedef enum MMCOOpcode { - MMCO_END = 0, - MMCO_SHORT2UNUSED, - MMCO_LONG2UNUSED, - MMCO_SHORT2LONG, - MMCO_SET_MAX_LONG, - MMCO_RESET, - MMCO_LONG, -} MMCOOpcode; - /** * Memory management control operation. */