From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 27799404FA for ; Mon, 24 Jan 2022 20:11:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7BFF68B18C; Mon, 24 Jan 2022 22:10:10 +0200 (EET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069036.outbound.protection.outlook.com [40.92.69.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5322368B14E for ; Mon, 24 Jan 2022 22:10:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eQcZodW3qv67TGxKNcBOWVU0/3PGlDbuqkC3RaxaxLxie8WLb+Ik7hi3VqLtzZ3VKRC6LfJoOFHDBTQmp7ZwU3A+arD6w0X7iR/9t67AbA3sLphTyEDn10/biRDRODzyNUPaCbfcjlA8JtZGqRaiJ6j1aBxEsefdGaYobVkq9JZTEqzE0mbBNXepohbJB3NxwjlyAIW6Bqdg/oCnFxQzEr80Nzks4Ff/iGNmAmim2Q/lCfL16V69/P2vrKsfRXnG4zbKdTM+uLce1dThpVP20RiSFAjS2KHgLXx+1LkHBW96cZ3xGTiKOXzU+lJ/ClqP3vGe4Z78THzVvYsL/3esWg== 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=iuzL7Fji8v+OqKs0brrr8z3tLqxvXFQedoXY/43dXRk=; b=bD1wP9J4EVa3fCmuKVkzJHMd9FRT5EXsTNjI+X013igV7jkqKjesBdblEzSKcEk/3AFTolKc4e1YVc5DKFa2WRQZt8Qj9/Dt/J6r6KHWmhWLG7yWmjXPni9fWZzvslcm0Ix3I8TX44Fo8ihb58lJVcfd6CZB9rq4j0i/qCqgF0NTVTKr5s5RRJc/2MrX62sfmPEFruudV+5z9riNkuSbQGHMvfLK/+dtyE+4SXDHgP3ORssJPuZbsXUj3JKrc87rI72Hysda5ahcEMTVN+f8Oa6CWqpaF0+Tz7Pa8yhXeXuWU9AVz9uKOZKcp/Qly+AJ3MqQn5tWyz2g42WVF/cMew== 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=iuzL7Fji8v+OqKs0brrr8z3tLqxvXFQedoXY/43dXRk=; b=uWMErS6jNVj6FBCYIAc9pIVAyUbsYcbXZUaNImPI/zzRdFPAS5w4dElzE3rswnYg5osKdXvFNetDYD/q5HV3+gvnehdIY9ztNDLjFRDcil76QxywjJfeGODOh7A3ZwYuMBybTUni3ogkRpRvwmLLL9U97OfhA/ebasRfsiKcSi7+8wf4KkxWgiY6SN9jVCKJGlaCf3K0dkK4+ghkhRaxrjZrdx2M/8uxcIygOqtmrmldOryRFnXmUpLJzKh9UNmcLzueIo3P2Mrw1hlLb0NBeAYODu4ixEWLSUoLNT45WeAZQavHfhbbMj00Ca2mMGAoRuTM9O77aIhQplWXUpvG8w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:00 +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:10:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:24 +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: [uVn594QEoxv1CYwacqMpF9VX21WgQU9b] 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-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93729bc3-b210-476e-56f9-08d9df757fcb X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lbHIzMNiKzT56jF4kgHgB13RueNs1rZBsrYGqTkOh0zZRWFvRLMyP+b7wik2AICknQpR4+S8yOQ+mUOjIi9Nt4UNtGurZuMbExGAyIyx/IT1q/r5xPMe5Fj/HjrQajtRKoPIPr2cCxofmn29jJW+PweUQQ8QumP7Sr3YiaeOO7ZpJbBo5/ZuEgar6MZAzwro21AVMCvq/oJKU5U/+6SWpeF7M5fthTGSX7vEdPbDuKnyenKE6ycguGeZShT0RbTiR+9Q8B0GufgiSWf+5M3uIlCeerrpRpTXx0wVUesQmm/hYCnfG6o17UiQaNyomB+KkC9PzVBuKognlJ+dsS1jc5Ix2d5vTv4ANzTUFXMXDL2kvlUARUCHtweCPjFHEAU9xH6C+mvMfr96hTe8FMXW55/APWs0Rda8INA7cv+ytrktlEovQcnFLk2wkY9C1ybZ4b9Y/Lfz/Lw8v2gN8MbHIHH2GqD9+crmVmKpuLDCEJtl0IxYfPU4nY2UBDn6/Gn0edjYo3kzS946eISWjesxN587GTGF0eQU1YAyvlUSGRr6XTmSs90h8KH8yDHfqYjmro83K4/Txa/v7XTKeA2Ymw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bdRdrZ1SPZanYDgRcIO5naIpNpRw1zEzYT1LrX+dOz/Pf22ZQFUIPcGlDU7l?= =?us-ascii?Q?818uWxGyMOE3nYq8zBq5J+opkRr+P2GyVqHMK6TKgjm7iMsKoFc90gf7ODyj?= =?us-ascii?Q?vQ7dqDlZkuDMbo/afKB9bMI85a4EothdSkzpq8H3IJtXOhGiwiP3hdhF5xrs?= =?us-ascii?Q?RI4RRJ6O9lYnToKGhE5NweZs2f06gXuU3cPGyI94cyM+ZK46KG9TEkBI/c3I?= =?us-ascii?Q?aYbe4aVIFpH4JYfh0xDcQY0OAc+c9jS5mgB1eoINV4LWfKFS65VtmEpZBEmL?= =?us-ascii?Q?HjecLPMfl0MI/QWgWS3AudVqnlKCe548ylYforIwoZ8iPf1H+Kvyw2wStAHZ?= =?us-ascii?Q?3aVOiHVtQRmS0HLhcYyhIlwPyuioX2tLFuWTXaDlNoRCSPl69Exc/xa2urNW?= =?us-ascii?Q?5/HPLcNcrFCAlm2kVbbp/elNtK+33COg8Ed/hB2F/kIC/LuTqZC1mDWFd7it?= =?us-ascii?Q?/7PASsX1KfXXk/AdbHwSv+3L8vc60abZgYSB+i87ME1ys3l6GBWrzvZy8iBj?= =?us-ascii?Q?wDoPiiDPVKflSXC/PcXQ5sVxmIVsGSmUEHkHPZX5ekty0rA6vrPtzm0/zVzg?= =?us-ascii?Q?4EqhRo7tcLfWHUfj04F8xezA0+fTWin3PLobq0Fz2NRwvUDjwp6+4grJrT2U?= =?us-ascii?Q?79NtqofT7GbQ3Jq31ttfUODxgvFzVPoGjUy91+guXgsC9gP9RCXYg5nbDk36?= =?us-ascii?Q?3HgriCN2nLwQ/zGcqcuJ70bONxABzGdFVDm9dV21o98bqpEGMzP7mnfUY5rm?= =?us-ascii?Q?nB42dwrRmy0Mj+hXFd4LlADDuUEdUfZNf8neJew149w8v9sFc8tJgjs1wECk?= =?us-ascii?Q?LhJSfF/k2tlPRLL8sDjVdQeeloa5km12dJgXY9YQIeEt8MYJMjLgsDo5XfmZ?= =?us-ascii?Q?Ab2ZYdZ07gZ/hXjCQgaMkAveqyzJ4aDNWZz2W39K4kH9fvIdZJD05BCyC3pa?= =?us-ascii?Q?P5C9J5Y2YZH/7fAgct9mDg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93729bc3-b210-476e-56f9-08d9df757fcb 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:59.9554 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 11/18] lavc/h264: move MB_TYPE defs from h264dec.h to h264_parse 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Anton Khirnov Allows to stop including h264dec.h in h264data.c. --- libavcodec/h264_parse.h | 3 +++ libavcodec/h264data.c | 2 +- libavcodec/h264dec.h | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 52b224f4c5..201d983952 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -33,6 +33,9 @@ #include "get_bits.h" #include "h264_ps.h" +#define MB_TYPE_REF0 MB_TYPE_ACPRED // dirty but it fits in 16 bit +#define MB_TYPE_8x8DCT 0x01000000 + // This table must be here because scan8[constant] must be known at compiletime static const uint8_t scan8[16 * 3 + 3] = { 4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8, diff --git a/libavcodec/h264data.c b/libavcodec/h264data.c index eb8728a9db..3e9e68cb04 100644 --- a/libavcodec/h264data.c +++ b/libavcodec/h264data.c @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" -#include "h264dec.h" +#include "h264_parse.h" #include "h264data.h" #include "mpegutils.h" diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 5266420fa1..f623d60893 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -95,8 +95,6 @@ #define CHROMA422(h) ((h)->ps.sps->chroma_format_idc == 2) #define CHROMA444(h) ((h)->ps.sps->chroma_format_idc == 3) -#define MB_TYPE_REF0 MB_TYPE_ACPRED // dirty but it fits in 16 bit -#define MB_TYPE_8x8DCT 0x01000000 #define IS_REF0(a) ((a) & MB_TYPE_REF0) #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".