From patchwork Mon Sep 25 23:55:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43911 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp1558791pzh; Mon, 25 Sep 2023 16:54:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXXTFLDzrEz/YMoTH0Lwqgv32RqQb4vsOrXa6/2CnWeUrYrEYKXzjDrtPNTD0uCm7decgf X-Received: by 2002:a17:907:7245:b0:9ae:793f:2010 with SMTP id ds5-20020a170907724500b009ae793f2010mr8185937ejc.42.1695686070055; Mon, 25 Sep 2023 16:54:30 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d8-20020a170906544800b00993a37afc87si10204922ejp.919.2023.09.25.16.54.29; Mon, 25 Sep 2023 16:54:30 -0700 (PDT) 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=go7dt2BQ; 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 CFBA268C5CE; Tue, 26 Sep 2023 02:54:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2075.outbound.protection.outlook.com [40.92.50.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E633D68C5CE for ; Tue, 26 Sep 2023 02:54:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dIWD+0NFwPdmKLjLKEbXa4C9SYTLZIztHvmQK6Cck/u5luEjBXCG3tTpVCmraLPHSAGFfbfGu6kR1O0pkzG0SeStyNNz4I7WUFzi5nwkGgErINGAnV0gQyGj/iL2MO8zp/B3fY4j+yULSq42xYYbGCnVyL8+7gkWVBVKHipENfS4sQrchu0I4Pu+maEhEtILfAtytCA+YNxH3IBa70aj4G12NNHaik4QfzkmYYhOAkz2plEccQazFGPJF6GqbryNslRNkpVccgQ+7LglmFf/6x+WE63QH9mT8aQb1IPJ+FxXs11TIeXzioUIzdXYw9XH22JbYBbsWFTsBx0WFj3GNA== 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=vbLgRXplPHpV8OUcCmMNhmyshCxA7Vw0TjjYARgXef0=; b=YcDrjAMteRuRxTp4Ud4xqeFA2SFV11r86GX/As9bLWCsRTeEXnvo7HpYVRX8Tod2TbzZ5Bnyh9I2uaErmCEUQQAjf7ApjekkFoovK0K498tWnOvTU4Oze53fwqsKAfwNrcYQoKkNgzWtpaE8fg8ziBQ1OeMKbu/FJ4NmGdwfFnVAltg0gbw+SBL2QEmjh61/NcicmAcVzuBv7fLOIeBgacttXl3Yi6uGb1fJESsL2QEBhZ5PkyM1A7cL+PjsRmrpon6TmQzcNoaDsITg2rTlZ50x+gOEqv4XQBdGoo4KRReezVAq6aSPfUaVAje29nza2OLJbouajT0n9ccz0Y/AWg== 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=vbLgRXplPHpV8OUcCmMNhmyshCxA7Vw0TjjYARgXef0=; b=go7dt2BQugbs9XxT5JoUFIHvnUeGd3qJloyKfQguhMi9JXAT2omKzoidVoTzVGPQvPTXyW40Sd//YzcfBjj5i8lQiHYCWDlzXGmHFrSOuz6y3FmhDZ5u6LsZx8eRZBgKmjsXkmLpHTfV5MXpJjdidxv7z/wa7lJJ4nPgt6Rotml+AhAXC3lU7l4uHWTi59er1VnbLA6+6fiz4Cj3JQgSeCHSfqkGJTt4ySQI/Bq1rWWMP85IcZ82KAh0+FhlWrhEia6cmzxQ/bHx2YbdtBeABF+GpiDkGLK71mZ+bVypw47eTb7BbT4LQiO0vWCdO1VHVQUr8x+7yOGnOp+xoMBnQw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0146.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:273::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Mon, 25 Sep 2023 23:54:18 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Mon, 25 Sep 2023 23:54:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Sep 2023 01:55:25 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ZqDpl6Hj41QHYJFdmjcMUlRfi44StnKu] X-ClientProxiedBy: ZR0P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230925235526.2668347-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0146:EE_ X-MS-Office365-Filtering-Correlation-Id: 92a63064-0e49-4ea6-9499-08dbbe22bafe X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JNz/CAdL8tLxt7ApSxjkCee4PreB+GwMGKDTGh/SWjG+kBvD7TU9o7DTZL/b+3mchcVFsqj9rbQztKNwMXeQDTAxAYRM9ZihmGp1Qjz0VUkFDWhUCoki/wW4muccHiJeiUkX4bL4Ry6BpWRVX9rdVaJDgBNIZr66i/9X3tTIUllfp21IMT/+yfMLHhlIi+DcqzSvhHvY720f85qTtBwbbIuZOWIyo6zZxIX5tstyLueDpuyU8OHv0SE6JW/heHNotLtOnrPK4gi9S+7y/Ti3nNPLLdZxdJNdx+porCTLVcCFAbBkDGWf/ZlBjxb2j3LMXiTWuwWaQ1icJX2ys3vVJcXKPUdkD9f+6xKXCegd4PsP88WQDH+vRmEHkq0cgtKMf5rxafP01TrGLJ5yufs9c96hvaRa5WiQkGy5SyRoylW/qY8UeKYzwUgFaFynKTo8pwhjO8+hp7ujzdXVFHBlX9OPv/7m0Cb1gqkrm2m4DIkA59XW+H/KDNVM2hMLwUZEqZYApcPCuXFx9iXuLaFDe7xKMeWucvWUMzq5zJb0pZaUcae2OFeHTDUfOqPEjEVcxc2VwyAT3X6PYLWMROSIQ5Qiybej5H9UNlP18qmk4wOzMDwB3oV3s1OBM8rYU4B4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d2TT3UoRbUO5iPaQWBuzBU2c3tPj72zazHf8xWAaSSuzS52kTEwxQlgvB8m+gYxMCIll8PGTaxnwOjo0Fx52q2I0ebtuQGzcDMlDkYfz2Hs0a+Hk89tXLpE0JwAMb0Ubkpv3K1eNppd1shTpdtRkGWiubezOkBOq9YJKC73L4jPLRcrXrawScKtKeujQkX9cZnSTY9az/nPElOKyNo8bbE+ljAVGsKILSU77lrrhLX10CFMDGVqP1d83lUBO9r76k1Pxmw41I5YdTpZr+w3V1T0+IScLk1Fg1Jh0OTji4hoXfJYkmOL5vtTvoyqKHlBJ/JCxxIUagHUiMrigwqZods0Mkfj29iJjSjFraTQBzz63w+/Q3yqOXwvi8V35vFZDMnYhzuUA3pxIcMIel5xqTGkb2fkCC+Xq9nRyQw80/uAZTsAkAbhSyK8Dck6NyYf3yOrNQrxS6GyF7MmiKHONu+FV79m3NFAK+YnmYr5Q6vyeBYdGb4G7RgGHVLS9xIX6KB+tlyloTIJk+aoqn8eQOTk2w3WOrMDEz1zLMV8H64pnSk/wKt04/FfrB4Q5ASM6eqzHRpcxV7D1YBpOjvOvFt5Wv6llVVUE1Sl1ivs9CvFHIY1uOgsck5wwPpq04mYIUr8Fx2eSPjk9vlekRzwYU/riNo65Ve3aB2wGRVX1jk8Jo0la1q2onWcpsc+7zO+OPbVyss4GXG/grXgYpsoLL5JL8aWc/zWVSPaJd3LXswxzLd/UR6E7wxiPtWtdAyKQmf7xlYSXjSA+tntn5uh8HIjujVMxJxgGUpnZkrhdFke61/TbfoYnd2xbqf2mzSlOq0UTzug2Ki4wR7pbYZkV0RsicGOh78CvQOmm/QanpjpUnT04Ew4XogXZhDnDO26PKtdV8tDoQgsNMensYi4QPu79npTsMOU2u3VtTQKK/FswMXa5pdGu1jahiAY1NzOK7e1qtDyVt0xzlta++ReC6sFOLuH4p/JkNMFp7ZRWUk6UwfdBPHEaoPQeSJyq/QALldWbkj8jRRd/0s4chbASyK05MHBwNiF4QBZm/mSCkFaPWAKRJs9pCxOGb2AcBlJwSAmtmg0TEF3G99Oh4fHGh8R4ei1WsUqDLIALJJPMsg2GNlHO5QJNMMh+kAoh+h4b1WPKXvf1MU6nF6DTgSXUE8T8obRdj4mJHGf0pTbfjVBkHOKiQTxWFRlvQKAtNSWzVNu0JPhYTGQqiUVo3FTfenFV4WtQ00VmoylDZIhxUSHri5ovbIsw45uZ9MqVmxKp X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92a63064-0e49-4ea6-9499-08dbbe22bafe X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2023 23:54:18.0648 (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: DU2P250MB0146 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/codec_par: Move enum AVFieldOrder to defs.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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HKWQlX3Wnmdr It is also used by AVCodecContext. Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 3 +++ libavcodec/codec_par.h | 10 +--------- libavcodec/defs.h | 8 ++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index ca7ffbb97e..c1ea3b7dc1 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-09-26 - xxxxxxxxxx - lavc 60.xx.100 - codec_par.h defs.h + Move the definition of enum AVFieldOrder from codec_par.h to defs.h. + 2023-09-26 - xxxxxxxxxx - lavf 60.xx.100 - avformat.h Deprecate AVFMT_ALLOW_FLUSH without replacement. Users can always flush any muxer by sending a NULL packet. diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index add90fdb1e..c1679ea042 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -29,21 +29,13 @@ #include "libavutil/pixfmt.h" #include "codec_id.h" +#include "defs.h" /** * @addtogroup lavc_core * @{ */ -enum AVFieldOrder { - AV_FIELD_UNKNOWN, - AV_FIELD_PROGRESSIVE, - AV_FIELD_TT, ///< Top coded_first, top displayed first - AV_FIELD_BB, ///< Bottom coded first, bottom displayed first - AV_FIELD_TB, ///< Top coded first, bottom displayed first - AV_FIELD_BT, ///< Bottom coded first, top displayed first -}; - /** * This struct describes the properties of an encoded stream. * diff --git a/libavcodec/defs.h b/libavcodec/defs.h index ceed8d5e16..00d840ec19 100644 --- a/libavcodec/defs.h +++ b/libavcodec/defs.h @@ -195,6 +195,14 @@ #define AV_LEVEL_UNKNOWN -99 +enum AVFieldOrder { + AV_FIELD_UNKNOWN, + AV_FIELD_PROGRESSIVE, + AV_FIELD_TT, ///< Top coded_first, top displayed first + AV_FIELD_BB, ///< Bottom coded first, bottom displayed first + AV_FIELD_TB, ///< Top coded first, bottom displayed first + AV_FIELD_BT, ///< Bottom coded first, top displayed first +}; /** * @ingroup lavc_decoding