From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id DC2CB41196
for <ffmpegdev@gitmailbox.com>; Thu, 17 Mar 2022 12:44:18 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7CFDF68B1A8;
Thu, 17 Mar 2022 14:43:55 +0200 (EET)
Received: from EUR04-HE1-obe.outbound.protection.outlook.com
(mail-oln040092073074.outbound.protection.outlook.com [40.92.73.74])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C76568B132
for <ffmpeg-devel@ffmpeg.org>; Thu, 17 Mar 2022 14:43:48 +0200 (EET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=aqFkXz/LYNzvbfcsO4yz/+FEnokZocehDW8hMUpjkZvQ3fRmtnALKxbD0ZDF/RfHb9I0CKlO/OAg4tXukt4o2gn6rmdJQxrL4Aqw4mvOkE/xlRu6QAZixzN3yrpns4OqT072l0oSOlX7nBoQz+bFXWmGOjFYPRNJWg2g5/FrYMsSuxLig3uENyF9+kM3eE1E8NdgnlqbrimHEkPg/c0XrE6pr5buEc/O/AMJx8S6xfTjagoGODFa/nZaISfWu+XwG4FZ//dk56koWfgWiDXHYqh4B8bLZ/mdKicCxO5I36D3ggjtmgJy3kEvt2nCI0TusvHCTkAr7XM0ZG2GKVDYTg==
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=I9YnUKG/VMHykFOzlEY83YCEgfvyOv6A0ecY4zIbutk=;
b=f59Bz58rMTZomRbAkVRMRDKun6cJYMh+gQYk4Kn9pMz/+TgAz7beynLgc6EN3HXM90mILlbde2nrtWZYlj/9cRS4KRw8jFxk6wDxfzlAfH5VWNfVtDPYz70R5ik5DhuU0J4916sFWbn10YaYBdWXrvY3iPsstvE3ymPI3ei+6eeDNwfXNeK5GX47gBnIw4E7E03VLVFarfkEv3t9+26FIabVhtJj9D27StRr3DnzbnHOQOtsLV9R++8ZGci6R414ElDtoH7GopC6urgy/WOJbaXDhWdJu669nmgqJ03o+y0dqBm57/MwzuxVveq2Vq/e+32h8BGL+p7hrEDTFNjWQQ==
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=I9YnUKG/VMHykFOzlEY83YCEgfvyOv6A0ecY4zIbutk=;
b=eqCAdcC8nc3xDahchrGDA647rcvn19IFcEfB2lfquPoODJemqzKKwVpo0+b0ktvYyo0F1dVQpjThntSqcBK3cbZl90RlZYZCXBtFJTJvb1WX4uAKDAAse5306PPEruuzTgL1JZ0SupIoLD+7xAhJ0sx/9yNbvSR9de+mm/tLo/2c1Ft3plNgxLWalZI146cs5IQZtzU/sFtQBgmz2cQHmbbPko/oSpaImrLRUHUM4/SDcjpIt9xRvkzQ1rC+P7laf+UPryX0jcwGBnS0vCHl+d8GJf2MhlthvBycy56DD2L5PGt8pcVPgtng84jr3iCUSbN8YDSLljLyudfiOVm0ag==
Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com
(2603:10a6:20b:4d1::16) by VI1PR0101MB2528.eurprd01.prod.exchangelabs.com
(2603:10a6:800:53::9) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22; Thu, 17 Mar
2022 12:43:43 +0000
Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com
([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com
([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.016; Thu, 17 Mar 2022
12:43:43 +0000
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 17 Mar 2022 13:43:19 +0100
Message-ID: <AS1PR01MB9564E93941F75E989ECDA69C8F129@AS1PR01MB9564.eurprd01.prod.exchangelabs.com>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <AS1PR01MB9564621E92A6F42E563B74A38F119@AS1PR01MB9564.eurprd01.prod.exchangelabs.com>
References: <AS1PR01MB9564621E92A6F42E563B74A38F119@AS1PR01MB9564.eurprd01.prod.exchangelabs.com>
X-TMN: [lCs4cFo4+w4F5sUbyqVuB0l78/94/bpN]
X-ClientProxiedBy: AS9PR06CA0037.eurprd06.prod.outlook.com
(2603:10a6:20b:463::21) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com
(2603:10a6:20b:4d1::16)
X-Microsoft-Original-Message-ID: <20220317124320.1123436-4-andreas.rheinhardt@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: d68067a3-3ac2-4606-7e50-08da0813c4f0
X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEvJU4wJzn4X4IRNJP3t2+ERmj0SmKpBGEi6iMMEQpe9albxzzT6VStDnsREar55SVvUH20NWhE6MpMRI1/8KmRL3M91hF1P+gWpEPJ5bAL+khdE0+I1QRjDRIzqKpT8RyCmq5Jgn83+Q9sCb2ocfifvnT2+t2V99+JQcrX4g5H3fDcmoKMx+/07dYJ0n7JK6khYVS7kcD3zx1qrBHR72XE9WQfPt4TNGLqAeu95PHYkge5Ty0OcUYvZsGiLbfcwGvgUoafAjWGv+pmEWB8DUwdUJdvndIg81niNZvw1oO3s/U3BI4OMY8E6X498nywEAByWhmwhXHYceEqnQoTilc6HIJxT+xNBGDTbXiVbk3l2NvhFvBht9YylNV+F8RMx7kk2otL7fVZ3MGXtM6v2V2rhiuoUnr6UkZJOcnPO8ONuo6fuLCvO8ikV1gdYUGzb/yRu0RdISOLPAOmVzdutGhgawoe+UM57NhEwl5RSYIjAJOu0egv4HmDC0xK6y2JwaeKzjTdLLZIHNsaCR3ERwlS4H1yIcCNRrI1C3jPeOXoRRF0c0vctDdoiobjJQPCKRN913b0nCBSTOfCEKfenwPTDHfCEOOMu5lshKJJgb5rhL/wFnMcvvBj4cYcLr54OXBlON4HhtUnySWYl3WbeemSh9Y+cGZ4RK08zdl/rQRt4J3UtvwTnoEgLA76X1OesP5TlRB++XLVbM8vQnGlZdsVOXhUlAv0MR69Dsa6N+bwwp/UbzDR3tN/1hfbt1YM9jKo3JiswAEh4LXSlBmGBLxIM
X-MS-TrafficTypeDiagnostic: VI1PR0101MB2528:EE_
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: mQs0/P7SQ+Zo9/9ymQAbRyXkGkLPIldnCaJVq6xCmRdrWOCoXiUMuEcc5Q/AdeW5ReXfOBLaHFoeBpEqCISy1TzWMqM6arkWrVaG3DMBxcdVyc/KyJRiiS8un4m0cbN+cSTPHbXgobKdON8T3rIprZOs4ZLJNjgqvPOo30YkjrPDECxjhTBoioY3KspTUEnXGXo2nnngscfVdkuae8xUApCt+oZg3KFcgWVbS7Ogg4/uDIRoD0Cy8Lsc8TGT7xYsygmmHWvqJjBaG4Furqhx+J2XJEQKdAr51xWaLmsA8XN43mONAhla6gluAtYoF4UWfdbZGIyA0KplCyQZSQiI1Ect5wP7QawR5qeVyj16emu1dR0g31pHboZTfxFVwVHFsIdQog73FhKe+7LzQCW9T83Q5QUqMUJc3zwoIxUHYbfSMKWw8lh6Zp/PVjk266TqZAuNerNmLvrmiZ9ennNVG7jpPG/LtJPuGrwZYmIah6A8yYSHs+eWR+3U9W3qGMZ50cgDzDFDg+AbdI9bIR9eCKcTCAOZzILr+GW43TbaLsu+f68gz9Eqq0SDdE4/EPgI/RdBuC2Co9LiuBBFAZaISg==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zw9Yk0G8V85Nu/OnGJI4WpSmHyi0Fxq0OuucCaETWVjW8TaKpkVHM/e1tKOD?=
=?us-ascii?Q?KnKzqyPKijggIO7ABs2qc7uhZNuKlEc5CDtO2BaRw12TKelh0/MKPWQdl4bn?=
=?us-ascii?Q?DGORUmH7tI/bfgeoSMUKKX1Wztp626eUK5r8d2eXU+GXxuRuAaGVkHU4Qgir?=
=?us-ascii?Q?zA4aIe6XHWohUiq7xnNkKZGxmhVnG07amohH0TpvtjqM8tLVwTwYEOTGUKsy?=
=?us-ascii?Q?eybOzE0c2utYwN8o2+qTqN8Nxi4bliwNOYS1aEKUk/3Ufg8rusyK0P+KwAVO?=
=?us-ascii?Q?CgCQdgyj3Tj7LIROc2gCoXxr7r4e8ewpZXKDUvH42G7JVrygsSBK8viwdSmK?=
=?us-ascii?Q?2wwDwkFOgXjNakcy2NTSO5ZYY/Z2EtAyQMJ0nUxN5oefB3jwmD7s+ZxS1vWX?=
=?us-ascii?Q?fSgE4R3lQagZZWO/t3wH+5JmWwCrCAl82poTnIHNhcWLjWkqhJCSxzu7zsZB?=
=?us-ascii?Q?kylFc5XRq3Cl0xDVnSl9BXzEeP+h29owYOSRaWcrjef9S03ZCwxYwdY5QLFK?=
=?us-ascii?Q?uWDmupDm50OwvWxr0LJ3bTJDCpAyWjbmAz5BFBmIVrX0lKAosZAmi836IlWb?=
=?us-ascii?Q?6rL1f7VhYTeo37nZIItIdxY0T7sucYEX88AdDDnObYiNIIX0Bw4/iKYqkZh7?=
=?us-ascii?Q?nsecV8mmYTkvUX5d1fk5eSMsEnOnJh9Gm5AKVt/LZiJtQOTGLcRE6FacNYg6?=
=?us-ascii?Q?a+UDPlfdKfzKBqmg2xvERZmJpsSLAawDrd6fcs0/HJEdEiHfi76pAnnjg/fe?=
=?us-ascii?Q?24zWfZ8pVRxxYRWLJZuA7rLPsOGBuqMRGXvXght/G+CPDs4uo07RGNFTz2gu?=
=?us-ascii?Q?qDbNLp5xdQ/apxJZBk1Q2wehxMCwEiH9vSMflvfRNL0l4M9TrMASFKjN3KIG?=
=?us-ascii?Q?B6V8QEEF3DDpTS4rIeVuvbMdgZajim/mwqxG7SpsWhndcIJ2q3qfIQCXk+nl?=
=?us-ascii?Q?b5z4UakBO1bd2G/OsnhpAjuf5739ewJAC+o7kOD6bVjx8VwLT6bHd7KPkSHw?=
=?us-ascii?Q?kudTkywbGMOPoWAv9zDiOgKql7rvCZs9o06FTK7ofB1m7PCci7qjgXMr+EyL?=
=?us-ascii?Q?4P+xU3KlbZzkJEjUdlTSgbuHHs6CuMNTTHVlFgAb/ReT2dzj9g9KMSBLEr5S?=
=?us-ascii?Q?vzBcKnSkPUzsAo0fGFM3DJzY8zyy/QEnxBtUMtIFcY15vr8j04rci5s=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d68067a3-3ac2-4606-7e50-08da0813c4f0
X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 12:43:42.9873 (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: VI1PR0101MB2528
Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/internal: Move
FF_DEFAULT_QUANT_BIAS to mpegvideoenc.h
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/AS1PR01MB9564E93941F75E989ECDA69C8F129@AS1PR01MB9564.eurprd01.prod.exchangelabs.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Only used there.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/internal.h | 2 --
libavcodec/mpegvideoenc.h | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 351c057d01..badca4c9dd 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -35,8 +35,6 @@
#include "bsf.h"
#include "config.h"
-#define FF_DEFAULT_QUANT_BIAS 999999
-
#define FF_QSCALE_TYPE_MPEG1 0
#define FF_QSCALE_TYPE_MPEG2 1
#define FF_QSCALE_TYPE_H264 2
diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h
index 9619f6787a..fae41457bf 100644
--- a/libavcodec/mpegvideoenc.h
+++ b/libavcodec/mpegvideoenc.h
@@ -29,7 +29,6 @@
#define AVCODEC_MPEGVIDEOENC_H
#include "libavutil/opt.h"
-#include "internal.h"
#include "mpegvideo.h"
#define UNI_AC_ENC_INDEX(run,level) ((run)*128 + (level))
@@ -42,6 +41,8 @@
#define FF_MPV_FLAG_NAQ 0x0010
#define FF_MPV_FLAG_MV0 0x0020
+#define FF_DEFAULT_QUANT_BIAS 999999
+
#define FF_MPV_OPT_CMP_FUNC \
{ "sad", "Sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
{ "sse", "Sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
--
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".