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 ESMTPS id CE19C4CD41 for ; Tue, 25 Feb 2025 12:29:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B213168C3B7; Tue, 25 Feb 2025 14:29:24 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2039.outbound.protection.outlook.com [40.92.90.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5508768C3F2 for ; Tue, 25 Feb 2025 14:29:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I0Q/QMc+ILWDQByNKC6oWAL1YT+cgOGSdFKEyjKRJWeAiugAZRwWfYszXELBHi2KP5RP4iDx+m9BX71SosTFL1OPo1GZlIkvqhvvxE8VuYG3+xiAeXH8pvcsoPtFAHRz8Qd2bSL9/KN3RpGox10OYH5cg59N+OQMfKDFlP1ZbMSwr08C83R2e43/6po80atsRaLIPosgZDlC23VlfEwzUi2Tvna2XOQq1WHpgYRuTPC7V0Hc2sSvNT8cBA5dz5CYPgwAYXmhPVAq0cUYN0gdAZAgx8WT9/1OHOCtzpXK8/MeOBgUEYJ5s4XouICKncB5Pd3RMdUCx9TpeoUO5+YFEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=zQYapVOYpTDRzamsISRErwtEmgkQuYV9U/7Tg0QaR1c=; b=o4l1vJw4QS7w+OD4Ysv15K89QYeVY2sQyknQREFilSUw+MKd1HH4dQTAbSFw7Vnv+a2oZlkonOwFz9g/7PCKCJH0NEVZgPfaPXQXwYWFu8hymkGJ5MTkuRpnK4j0cDXye1yAiHTM+YKjROi1udcuC7q3buQWSqmtczvjQ8k0oH8wqoHXyob5Qtln/AkGzBqPOdP6T3v2dUBAzZEP0ZWNIPlZvra7XnSG72xsOrXC/hHwfHcOLUzqFsu7zJzNW6sqX3KpoTAOyaHKL9Lhm4m1GjTcqyvUNuQolNcbDWC3UdNtzvFJiPFwDyweoLf/9VKr/J0c8eS0aF7RSJl9P0hOpA== 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=zQYapVOYpTDRzamsISRErwtEmgkQuYV9U/7Tg0QaR1c=; b=NNoB95qwkGlmKkOfD9CPLAAXbNZCLbkT4Pw+nbxKW7dgIGwYkuHIMY0qY2LBtf/TPLqlSS/LfbKqyU55Zc8lP6kElrTg1GtJ3GjiaH/KIpDef+Lh/lTfDrcLMZSEMVe5uyxgf6LWDstZHXpt/9Vu04j3+ekCnOM/zDY3f/xcJtwrOitFfTdddXz/NcuYO3wqAkfta83fnYUkMslNIJ+SFoNtVZK1PPhSTti650xWqsUEu7gmnvLh/ArLFqBXIsuNP5XwvS1R+oq12kLReYqvsxAcYvgLh0GAJi3JBjcx98dzx5aBmQI/D8TyVuWwlLlsPOmo1xQUVk7haNE4aIDmKQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0682.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4bd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.14; Tue, 25 Feb 2025 12:29:17 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%5]) with mapi id 15.20.8489.014; Tue, 25 Feb 2025 12:29:17 +0000 Content-Type: multipart/mixed; boundary="------------8LeAoqG8dwrQzy06wXKU2COK" Message-ID: Date: Tue, 25 Feb 2025 13:29:15 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20250223220630.18756-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20250223220630.18756-1-jamrial@gmail.com> X-ClientProxiedBy: ZR0P278CA0086.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <5c862bb6-9852-4027-8cc5-0a111fbf925a@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0682:EE_ X-MS-Office365-Filtering-Correlation-Id: c9fe5755-5ab5-406f-6055-08dd55980562 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|5072599009|19110799003|12121999004|7092599003|15080799006|6092099012|8060799006|3412199025|440099028|13095399003; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UWRMMEt4RVZLNC9kcG5yZ0JWQ2NVOVpnNnY3aWVaaWN5TXBlbFBORERxL0FJ?= =?utf-8?B?WnZQSHluY3JvMjBpbndCaTMvekFzOGpXWElJbXBTcGdqa1NQUHoyNWJkdHdz?= =?utf-8?B?M0pKZkN2TEpJeDBrZ1ZqRUR0eEptWGVDVlEzblFDRnB6ZDUvUEFBcXpHNnFs?= =?utf-8?B?YnZxaHBoZVE3aWZvMytXZ1J6eTRDYmZZRFVPaGJrOTBLekJkSHBMUGhrNlhO?= =?utf-8?B?MThtN29aT0NtK3BzNEltSUd5aDZLL1Z1RG1KRHRVQk1lZnhHOWlFN0oyUWJE?= =?utf-8?B?azRvRjdrQzFYNVI2aWRYLzY2RHBpUy9naEExSE80VWZEM3ZDTVZFVTFsRlRw?= =?utf-8?B?L2UzRG05S2R4U1JlaHNBUzN2VjE2dG84Y3Fxb1ZxRUlmL3ZoSUxOQVpjbXo3?= =?utf-8?B?dE1mYU9MWGhLb2IxY3NZS1VjSy9IQ0JiWURBRkJqUmtkVldIVWJUQldiOVZJ?= =?utf-8?B?cjgwS0hSWHRxbTc0cDgxbHYrcy9WK0c0Z1dLSDN1dThNc0RtcFpFZEM2ekYr?= =?utf-8?B?bStEVjRxcTBJQmFJdzJDdWRyZ09rT3FoZjB1MDlCczg4YWlwMDRweDdQejZT?= =?utf-8?B?Nkt4UUZQTkE2SGx3M1VzMW40MWVRdVZoZHVvTGRPZkVXYzZyNTdUWHIwSU1z?= =?utf-8?B?WVh6elNEL2NlaFF6U3dveG1VSll6YzFuUzBjNnZWTldBRDJ5eEZyK0VCVC9E?= =?utf-8?B?LytJMWZEQzlkaVBaSzhCdHhjTzY2Mm93Z3duSkF6N3FiM1Rhdnp5UmxKLy9o?= =?utf-8?B?L0QyWXVBRzJFSzRSR1FKUEtLWEtNbkNpODFKSXpocW9nNmZJSXdGM3Bpb2J4?= =?utf-8?B?dms1TXBvQkFtbmJFVjdoSTBZWkxjUVpnNm9yd1JkS2pOWTZzeUhGNjc1OHdj?= =?utf-8?B?cHZwZEdWZkpiYXhKZEVSQlJLZnZiRW5aSXoydkdaRGN3SzR0VzdGQmQxcmE0?= =?utf-8?B?V1JmZFhEa2pHdlJjaHcwaHZCNm1aQTU0aElETjZZd0dkNXFFRVkwWjhsTFEr?= =?utf-8?B?S2VwOHZ1eCs5cHBlOHV2SDV6THVLMExDa3JyRnAyWmJIbG15S2JrYmhBVlJ4?= =?utf-8?B?czh6WGt0VmZDcXpMTGJlOWxrZ0pyd0loQnpGamRBYkRxTiswRm4ycTVvU0Q5?= =?utf-8?B?UExmQ1Zub2xHNkdLMVhjcXFwZS8yZkYyWHZ6SktIZWpFdW4wZWFaUmhjN0Vz?= =?utf-8?B?VTFaWTg0eFZnclNNOUlSY1N5ckkrR2FBOFNaTlFFU2wrcXdsQmRzYkx6UWpn?= =?utf-8?B?RndxMUQ3M01SalpCeHJvUzNSSnkrNEVDSCtIT0RvU1czUTM4a3RJRnhzcWdr?= =?utf-8?B?TDBlb0IwUWw0SkRObWdzNTdrNCtzV2RFVlFMVUtMaG5IWTE0UXNrajZkV3Nh?= =?utf-8?B?T2I0ZU8zSk14TGZkMXNYaWV4c01ESGtYTXJSQkNsdFdjTnJ4aTFmT3BXK1V1?= =?utf-8?B?NkRLOVhLS0Q1RUt2bERIa2J6WVErYVo3L3hwR2FOc0F2a2kxL0JKOTZyWnZC?= =?utf-8?B?cTZYQ2w4QWowMDNBenhJNEFIN0hsWG90dHd0UDNkR2M5TFlqUGpYZTFUVEp4?= =?utf-8?Q?1AAK9XF/7ipDJ4nHkJDIBsBZw=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cEd1Tmx5TWxYbEM2SEREbFlYODNmR3BCdjhvREVMRktrN09CN29ScGJDM2Fz?= =?utf-8?B?cjBGS1FmQjJvanZyUHgyUW5jUGFYbFg5THFxLzFEQ1N5dWN1VWoyV1BPR0xk?= =?utf-8?B?MXk1R1FJcWp3VzRvVjA3L3h3UytLd3RjZkdDQkM1QmpHOUUrM2ZwVy8rRXBB?= =?utf-8?B?UmxIUisyUXkwQXhSV2hUYnNNZm1LQzFMZHQ4NXM0a08vczhxaUpyM3J0K25O?= =?utf-8?B?ZGdRZkJpd0JWREhpV3RIWXYraHVxWEFYanpJZElWcmNDMXBabkJ5WDJ5Q2Rz?= =?utf-8?B?VmhLUXVsb1RxYlFXdFI1Q1E2eVFmNmt2TnBTY1h0WG9QeFNLeGhkMFlRQjdC?= =?utf-8?B?Yy8wTkZFUHpKM3oza2pNMC9HRDhCazE3L1FCUy9kcVE3M0hrNDJoRjBCUFFy?= =?utf-8?B?bGdPUU5mZnZHVElpYTg0b2VtWkFXbTltc3lmbHFLZENneis3Z25QVE9qZ3VT?= =?utf-8?B?enIzUnlNZ0NBOXZvYmVrbGhlczZyWWVNWjlUcVZkWmVLUWFDWmI2eUNMdm1y?= =?utf-8?B?djFjZUhrTkZEbmFmNHpYUTIyS2IwRkRXNVlCNHdUdVFyZ3l0TmxBMStOcDUr?= =?utf-8?B?L2UvSzlpbXl3czRqZUNSemZieS9qeHpoTkpVRE9RNVNRSC8yTVpCaE5OL1lV?= =?utf-8?B?L0tucUxpcHhKUGt3OTh1ZU5DbW1kQWV1K09ybGxBZ1A4VmFjampzOC9XRWhK?= =?utf-8?B?Uk02czNOTDV2U0x5YkQ5dkZoVUNzRlZWZFhnTEQ3cHhPZlJmS1ZTUW9lMyt1?= =?utf-8?B?eE5rcGd5dGhidTR0ODJEVS9YQXpRa3FmUW1iYUZyL09jdWhXcFdDcDFGakF2?= =?utf-8?B?QmViVkJmZ2FzcTUybXdDRnEvdnR0WUhMU0tpQ0gySnlMMzRVL1NmL3M1WW1M?= =?utf-8?B?SzBDU3hncE1pcWR3bFQ5MUtueUhIU0FHa1RpeUNRemRoaXUzUEhMY0NLYXpF?= =?utf-8?B?SHRjRnJtZ04zcDcrVlBaZVZWY2V1YlBrc3VhL0Z6Wk9BeS9vK2JEK0JyOFhJ?= =?utf-8?B?T05RS1FFZlAyWGxPYUI1Q3Q1TDRJTXRsODRld3hXZy9ibVk5YlkrY3FsUSt5?= =?utf-8?B?K05EdTBUVHo5T0Z3Qi9vOEoxcmVvZmQ3Y29OL2oyVTJISDBPWWZwRWtPbTFK?= =?utf-8?B?RzJPWEdRcWIyS3hZVkkrbytMNHZjSWU4OXJXNWdOMDNDUzFoVDdvSEpKSjVi?= =?utf-8?B?bzIwcmFTMFArajkvQkN2UXk0V05aWUIxYXhhSVVYblAxaktwREU2d0p2NWxR?= =?utf-8?B?Z0Y0T2l3K0xVTkRiSjZvbkkwWjlRSC9mNEM4aEJyUUFLRTc1a2pWQ0EwL2p4?= =?utf-8?B?TldweFg5b0pzLzc0Y0JacnArbjRmcHlyUTc4VVRGaE1XcUV6OXNWa25na2VI?= =?utf-8?B?YVZ5QUV4ZVlQRDdIcXZ0QXBzUW1VOU5NVThEanllM0pCd01EOE1yWEs5Smxr?= =?utf-8?B?d05OTE01NkVrMGlYa2hvK0dvSWF2MC8rd3hDQUpaeFFhSkZYNDJiYnREaU5o?= =?utf-8?B?WUFKalNtTk5xSElldEROc0ErM0NpYVBuKzcwa1lVWkZrZjVrcWJBeEthZlNm?= =?utf-8?B?MytTa1BmRGU1aXM5VTJKSGdTclJmMTROay9jNEdUeGx3VWR1dEJORVJjbE5q?= =?utf-8?B?eDJaTmsyaitQZkZETU1seTFVOWdYTDBIenlZbm5ueHd4cjA3bno1b0lDVWpQ?= =?utf-8?B?WGNQWmxkRHpSNGZxb2VsTi9vaG1PaGNZbXpWU3poL0RReVlqdUtXVk1BPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9fe5755-5ab5-406f-6055-08dd55980562 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2025 12:29:17.2316 (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: AS4P250MB0682 Subject: [FFmpeg-devel] [PATCH] avutil/frame: Port AVFrame.private_ref to RefStruct API 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --------------8LeAoqG8dwrQzy06wXKU2COK Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit James Almer: > It's been a year since the last bump, so lets get rid of old deprecated API > in time for ffmpeg 8.0 > I want to add the attached patch to that set. There will probably be a minor conflict with the FF_API_FRAME_KEY patch (your github account didn't have a branch of this, so I based it on master, not on your patchset), but that is trivial to fix. One more thing: Did you check whether you can now remove inclusions of version*.h and attributes.h (for attribute_deprecated) headers? I don't see you do this and it is often forgotten. - Andreas --------------8LeAoqG8dwrQzy06wXKU2COK Content-Type: text/x-patch; charset=UTF-8; name="0001-avutil-frame-Port-AVFrame.private_ref-to-RefStruct-A.patch" Content-Disposition: attachment; filename*0="0001-avutil-frame-Port-AVFrame.private_ref-to-RefStruct-A.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzYTg5YTBiZTIwZDIxNjg4ZjQxMzRjZDgwZWFlM2JkNzFjZmNkOTk2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZWFzIFJoZWluaGFyZHQgPGFuZHJlYXMucmhlaW5oYXJk dEBvdXRsb29rLmNvbT4KRGF0ZTogVHVlLCAyNSBGZWIgMjAyNSAxMjo1OToxNyArMDEwMApTdWJq ZWN0OiBbUEFUQ0hdIGF2dXRpbC9mcmFtZTogUG9ydCBBVkZyYW1lLnByaXZhdGVfcmVmIHRvIFJl ZlN0cnVjdCBBUEkKClRoaXMgaXMgcG9zc2libGUgd2l0aG91dCBkZXByZWNhdGlvbiBwZXJpb2Qs IGJlY2F1c2Ugc2FpZCBmaWVsZAppcyBkb2N1bWVudGVkIGFzIG9ubHkgZm9yIG91ciBsaWJhdiog bGlicmFyaWVzIGFuZCBub3QgdGhlIGdlbmVyYWwKcHVibGljLgoKU2lnbmVkLW9mZi1ieTogQW5k cmVhcyBSaGVpbmhhcmR0IDxhbmRyZWFzLnJoZWluaGFyZHRAb3V0bG9vay5jb20+Ci0tLQogbGli YXZjb2RlYy9kZWNvZGUuYyAgICAgICB8IDI4ICsrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0K IGxpYmF2Y29kZWMvbGNldmNkZWMuYyAgICAgfCAgMiArLQogbGliYXZjb2RlYy9udmRlYy5jICAg ICAgICB8ICA4ICsrKystLS0tCiBsaWJhdmNvZGVjL252ZGVjX2F2MS5jICAgIHwgIDIgKy0KIGxp YmF2Y29kZWMvbnZkZWNfaDI2NC5jICAgfCAgNCArKy0tCiBsaWJhdmNvZGVjL252ZGVjX2hldmMu YyAgIHwgIDQgKystLQogbGliYXZjb2RlYy9udmRlY19tanBlZy5jICB8ICAyICstCiBsaWJhdmNv ZGVjL252ZGVjX21wZWcxMi5jIHwgIDIgKy0KIGxpYmF2Y29kZWMvbnZkZWNfbXBlZzQuYyAgfCAg MiArLQogbGliYXZjb2RlYy9udmRlY192YzEuYyAgICB8ICAyICstCiBsaWJhdmNvZGVjL252ZGVj X3ZwOC5jICAgIHwgIDIgKy0KIGxpYmF2Y29kZWMvbnZkZWNfdnA5LmMgICAgfCAgMiArLQogbGli YXZjb2RlYy92aWRlb3Rvb2xib3guYyB8ICAyICstCiBsaWJhdnV0aWwvZnJhbWUuYyAgICAgICAg IHwgMTIgKysrKy0tLS0tLS0tCiBsaWJhdnV0aWwvZnJhbWUuaCAgICAgICAgIHwgMTAgKysrLS0t LS0tLQogMTUgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgNTEgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9kZWNvZGUuYyBiL2xpYmF2Y29kZWMvZGVjb2RlLmMK aW5kZXggY2FjN2U2MjBkMi4uYzgyMmJkNTVmNSAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9kZWNv ZGUuYworKysgYi9saWJhdmNvZGVjL2RlY29kZS5jCkBAIC03MDMsMTEgKzcwMywxMSBAQCBGRl9F TkFCTEVfREVQUkVDQVRJT05fV0FSTklOR1MKIAogICAgICAgICAvKiB0aGUgb25seSBjYXNlIHdo ZXJlIGRlY29kZSBkYXRhIGlzIG5vdCBzZXQgc2hvdWxkIGJlIGRlY29kZXJzCiAgICAgICAgICAq IHRoYXQgZG8gbm90IGNhbGwgZmZfZ2V0X2J1ZmZlcigpICovCi0gICAgICAgIGF2X2Fzc2VydDAo KGZyYW1lLT5wcml2YXRlX3JlZiAmJiBmcmFtZS0+cHJpdmF0ZV9yZWYtPnNpemUgPT0gc2l6ZW9m KEZyYW1lRGVjb2RlRGF0YSkpIHx8CisgICAgICAgIGF2X2Fzc2VydDAoZnJhbWUtPnByaXZhdGVf cmVmIHx8CiAgICAgICAgICAgICAgICAgICAgIShhdmN0eC0+Y29kZWMtPmNhcGFiaWxpdGllcyAm IEFWX0NPREVDX0NBUF9EUjEpKTsKIAogICAgICAgICBpZiAoZnJhbWUtPnByaXZhdGVfcmVmKSB7 Ci0gICAgICAgICAgICBGcmFtZURlY29kZURhdGEgKmZkZCA9IChGcmFtZURlY29kZURhdGEqKWZy YW1lLT5wcml2YXRlX3JlZi0+ZGF0YTsKKyAgICAgICAgICAgIEZyYW1lRGVjb2RlRGF0YSAqZmRk ID0gZnJhbWUtPnByaXZhdGVfcmVmOwogCiAgICAgICAgICAgICBpZiAoZmRkLT5wb3N0X3Byb2Nl c3MpIHsKICAgICAgICAgICAgICAgICByZXQgPSBmZGQtPnBvc3RfcHJvY2VzcyhhdmN0eCwgZnJh bWUpOwpAQCAtNzIwLDcgKzcyMCw3IEBAIEZGX0VOQUJMRV9ERVBSRUNBVElPTl9XQVJOSU5HUwog ICAgIH0KIAogICAgIC8qIGZyZWUgdGhlIHBlci1mcmFtZSBkZWNvZGUgZGF0YSAqLwotICAgIGF2 X2J1ZmZlcl91bnJlZigmZnJhbWUtPnByaXZhdGVfcmVmKTsKKyAgICBhdl9yZWZzdHJ1Y3RfdW5y ZWYoJmZyYW1lLT5wcml2YXRlX3JlZik7CiAKICAgICByZXR1cm4gcmV0OwogfQpAQCAtMTYyMywz OSArMTYyMywyOSBAQCBzdGF0aWMgdm9pZCB2YWxpZGF0ZV9hdmZyYW1lX2FsbG9jYXRpb24oQVZD b2RlY0NvbnRleHQgKmF2Y3R4LCBBVkZyYW1lICpmcmFtZSkKICAgICB9CiB9CiAKLXN0YXRpYyB2 b2lkIGRlY29kZV9kYXRhX2ZyZWUodm9pZCAqb3BhcXVlLCB1aW50OF90ICpkYXRhKQorc3RhdGlj IHZvaWQgZGVjb2RlX2RhdGFfZnJlZShBVlJlZlN0cnVjdE9wYXF1ZSB1bnVzZWQsIHZvaWQgKm9i aikKIHsKLSAgICBGcmFtZURlY29kZURhdGEgKmZkZCA9IChGcmFtZURlY29kZURhdGEqKWRhdGE7 CisgICAgRnJhbWVEZWNvZGVEYXRhICpmZGQgPSBvYmo7CiAKICAgICBpZiAoZmRkLT5wb3N0X3By b2Nlc3Nfb3BhcXVlX2ZyZWUpCiAgICAgICAgIGZkZC0+cG9zdF9wcm9jZXNzX29wYXF1ZV9mcmVl KGZkZC0+cG9zdF9wcm9jZXNzX29wYXF1ZSk7CiAKICAgICBpZiAoZmRkLT5od2FjY2VsX3ByaXZf ZnJlZSkKICAgICAgICAgZmRkLT5od2FjY2VsX3ByaXZfZnJlZShmZGQtPmh3YWNjZWxfcHJpdik7 Ci0KLSAgICBhdl9mcmVlcCgmZmRkKTsKIH0KIAogaW50IGZmX2F0dGFjaF9kZWNvZGVfZGF0YShB VkZyYW1lICpmcmFtZSkKIHsKLSAgICBBVkJ1ZmZlclJlZiAqZmRkX2J1ZjsKICAgICBGcmFtZURl Y29kZURhdGEgKmZkZDsKIAogICAgIGF2X2Fzc2VydDEoIWZyYW1lLT5wcml2YXRlX3JlZik7Ci0g ICAgYXZfYnVmZmVyX3VucmVmKCZmcmFtZS0+cHJpdmF0ZV9yZWYpOworICAgIGF2X3JlZnN0cnVj dF91bnJlZigmZnJhbWUtPnByaXZhdGVfcmVmKTsKIAotICAgIGZkZCA9IGF2X21hbGxvY3ooc2l6 ZW9mKCpmZGQpKTsKKyAgICBmZGQgPSBhdl9yZWZzdHJ1Y3RfYWxsb2NfZXh0KHNpemVvZigqZmRk KSwgMCwgTlVMTCwgZGVjb2RlX2RhdGFfZnJlZSk7CiAgICAgaWYgKCFmZGQpCiAgICAgICAgIHJl dHVybiBBVkVSUk9SKEVOT01FTSk7CiAKLSAgICBmZGRfYnVmID0gYXZfYnVmZmVyX2NyZWF0ZSgo dWludDhfdCopZmRkLCBzaXplb2YoKmZkZCksIGRlY29kZV9kYXRhX2ZyZWUsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgTlVMTCwgQVZfQlVGRkVSX0ZMQUdfUkVBRE9OTFkpOwotICAg IGlmICghZmRkX2J1ZikgewotICAgICAgICBhdl9mcmVlcCgmZmRkKTsKLSAgICAgICAgcmV0dXJu IEFWRVJST1IoRU5PTUVNKTsKLSAgICB9Ci0KLSAgICBmcmFtZS0+cHJpdmF0ZV9yZWYgPSBmZGRf YnVmOworICAgIGZyYW1lLT5wcml2YXRlX3JlZiA9IGZkZDsKIAogICAgIHJldHVybiAwOwogfQpA QCAtMTY4Miw3ICsxNjcyLDcgQEAgc3RhdGljIHZvaWQgYXR0YWNoX3Bvc3RfcHJvY2Vzc19kYXRh KEFWQ29kZWNDb250ZXh0ICphdmN0eCwgQVZGcmFtZSAqZnJhbWUpCiAgICAgRGVjb2RlQ29udGV4 dCAgICAgICAgKmRjID0gZGVjb2RlX2N0eChhdmNpKTsKIAogICAgIGlmIChkYy0+bGNldmNfZnJh bWUpIHsKLSAgICAgICAgRnJhbWVEZWNvZGVEYXRhICpmZGQgPSAoRnJhbWVEZWNvZGVEYXRhKilm cmFtZS0+cHJpdmF0ZV9yZWYtPmRhdGE7CisgICAgICAgIEZyYW1lRGVjb2RlRGF0YSAqZmRkID0g ZnJhbWUtPnByaXZhdGVfcmVmOwogCiAgICAgICAgIGZkZC0+cG9zdF9wcm9jZXNzX29wYXF1ZSA9 IGF2X3JlZnN0cnVjdF9yZWYoZGMtPmxjZXZjKTsKICAgICAgICAgZmRkLT5wb3N0X3Byb2Nlc3Nf b3BhcXVlX2ZyZWUgPSBmZl9sY2V2Y191bnJlZjsKZGlmZiAtLWdpdCBhL2xpYmF2Y29kZWMvbGNl dmNkZWMuYyBiL2xpYmF2Y29kZWMvbGNldmNkZWMuYwppbmRleCA0Y2E1ZGZhMGE2Li4yZmUwNmI4 ODAwIDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL2xjZXZjZGVjLmMKKysrIGIvbGliYXZjb2RlYy9s Y2V2Y2RlYy5jCkBAIC0yNzgsNyArMjc4LDcgQEAgc3RhdGljIGludCBsY2V2Y19pbml0KEZGTENF VkNDb250ZXh0ICpsY2V2Yywgdm9pZCAqbG9nY3R4KQogCiBpbnQgZmZfbGNldmNfcHJvY2Vzcyh2 b2lkICpsb2djdHgsIEFWRnJhbWUgKmZyYW1lKQogewotICAgIEZyYW1lRGVjb2RlRGF0YSAgKmZk ZCA9IChGcmFtZURlY29kZURhdGEqKWZyYW1lLT5wcml2YXRlX3JlZi0+ZGF0YTsKKyAgICBGcmFt ZURlY29kZURhdGEgICpmZGQgPSBmcmFtZS0+cHJpdmF0ZV9yZWY7CiAgICAgRkZMQ0VWQ0NvbnRl eHQgKmxjZXZjID0gZmRkLT5wb3N0X3Byb2Nlc3Nfb3BhcXVlOwogICAgIGludCByZXQ7CiAKZGlm ZiAtLWdpdCBhL2xpYmF2Y29kZWMvbnZkZWMuYyBiL2xpYmF2Y29kZWMvbnZkZWMuYwppbmRleCA5 OTM1MTY2MWVhLi5kNDQ0MTM1ZmQ3IDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL252ZGVjLmMKKysr IGIvbGliYXZjb2RlYy9udmRlYy5jCkBAIC00OTQsNyArNDk0LDcgQEAgZmluaXNoOgogCiBzdGF0 aWMgaW50IG52ZGVjX3JldHJpZXZlX2RhdGEodm9pZCAqbG9nY3R4LCBBVkZyYW1lICpmcmFtZSkK IHsKLSAgICBGcmFtZURlY29kZURhdGEgICpmZGQgPSAoRnJhbWVEZWNvZGVEYXRhKilmcmFtZS0+ cHJpdmF0ZV9yZWYtPmRhdGE7CisgICAgRnJhbWVEZWNvZGVEYXRhICAqZmRkID0gZnJhbWUtPnBy aXZhdGVfcmVmOwogICAgIE5WREVDRnJhbWUgICAgICAgICpjZiA9IChOVkRFQ0ZyYW1lKilmZGQt Pmh3YWNjZWxfcHJpdjsKICAgICBOVkRFQ0RlY29kZXIgKmRlY29kZXIgPSBjZi0+ZGVjb2RlcjsK IApAQCAtNTc1LDcgKzU3NSw3IEBAIGZpbmlzaDoKIGludCBmZl9udmRlY19zdGFydF9mcmFtZShB VkNvZGVjQ29udGV4dCAqYXZjdHgsIEFWRnJhbWUgKmZyYW1lKQogewogICAgIE5WREVDQ29udGV4 dCAqY3R4ID0gYXZjdHgtPmludGVybmFsLT5od2FjY2VsX3ByaXZfZGF0YTsKLSAgICBGcmFtZURl Y29kZURhdGEgKmZkZCA9IChGcmFtZURlY29kZURhdGEqKWZyYW1lLT5wcml2YXRlX3JlZi0+ZGF0 YTsKKyAgICBGcmFtZURlY29kZURhdGEgKmZkZCA9IGZyYW1lLT5wcml2YXRlX3JlZjsKICAgICBO VkRFQ0ZyYW1lICpjZiA9IE5VTEw7CiAgICAgaW50IHJldDsKIApAQCAtNjEzLDcgKzYxMyw3IEBA IGZhaWw6CiBpbnQgZmZfbnZkZWNfc3RhcnRfZnJhbWVfc2VwX3JlZihBVkNvZGVjQ29udGV4dCAq YXZjdHgsIEFWRnJhbWUgKmZyYW1lLCBpbnQgaGFzX3NlcF9yZWYpCiB7CiAgICAgTlZERUNDb250 ZXh0ICpjdHggPSBhdmN0eC0+aW50ZXJuYWwtPmh3YWNjZWxfcHJpdl9kYXRhOwotICAgIEZyYW1l RGVjb2RlRGF0YSAqZmRkID0gKEZyYW1lRGVjb2RlRGF0YSopZnJhbWUtPnByaXZhdGVfcmVmLT5k YXRhOworICAgIEZyYW1lRGVjb2RlRGF0YSAqZmRkID0gZnJhbWUtPnByaXZhdGVfcmVmOwogICAg IE5WREVDRnJhbWUgKmNmOwogICAgIGludCByZXQ7CiAKQEAgLTc4MCw3ICs3ODAsNyBAQCBpbnQg ZmZfbnZkZWNfZ2V0X3JlZl9pZHgoQVZGcmFtZSAqZnJhbWUpCiAgICAgaWYgKCFmcmFtZSB8fCAh ZnJhbWUtPnByaXZhdGVfcmVmKQogICAgICAgICByZXR1cm4gLTE7CiAKLSAgICBmZGQgPSAoRnJh bWVEZWNvZGVEYXRhKilmcmFtZS0+cHJpdmF0ZV9yZWYtPmRhdGE7CisgICAgZmRkID0gZnJhbWUt PnByaXZhdGVfcmVmOwogICAgIGNmICA9IChOVkRFQ0ZyYW1lKilmZGQtPmh3YWNjZWxfcHJpdjsK ICAgICBpZiAoIWNmKQogICAgICAgICByZXR1cm4gLTE7CmRpZmYgLS1naXQgYS9saWJhdmNvZGVj L252ZGVjX2F2MS5jIGIvbGliYXZjb2RlYy9udmRlY19hdjEuYwppbmRleCA2YjQwOGVkYjg3Li43 NGZjZGI2YjExIDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL252ZGVjX2F2MS5jCisrKyBiL2xpYmF2 Y29kZWMvbnZkZWNfYXYxLmMKQEAgLTYyLDcgKzYyLDcgQEAgc3RhdGljIGludCBudmRlY19hdjFf c3RhcnRfZnJhbWUoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBjb25zdCB1aW50OF90ICpidWZmZXIs IHUKICAgICBpZiAocmV0IDwgMCkKICAgICAgICAgcmV0dXJuIHJldDsKIAotICAgIGZkZCA9IChG cmFtZURlY29kZURhdGEqKWN1cl9mcmFtZS0+cHJpdmF0ZV9yZWYtPmRhdGE7CisgICAgZmRkID0g Y3VyX2ZyYW1lLT5wcml2YXRlX3JlZjsKICAgICBjZiAgPSAoTlZERUNGcmFtZSopZmRkLT5od2Fj Y2VsX3ByaXY7CiAKICAgICAqcHAgPSAoQ1VWSURQSUNQQVJBTVMpIHsKZGlmZiAtLWdpdCBhL2xp YmF2Y29kZWMvbnZkZWNfaDI2NC5jIGIvbGliYXZjb2RlYy9udmRlY19oMjY0LmMKaW5kZXggMWFl M2RmZDAzMi4uNTE4MTNlMWFiZSAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9udmRlY19oMjY0LmMK KysrIGIvbGliYXZjb2RlYy9udmRlY19oMjY0LmMKQEAgLTM0LDcgKzM0LDcgQEAKIHN0YXRpYyB2 b2lkIGRwYl9hZGQoY29uc3QgSDI2NENvbnRleHQgKmgsIENVVklESDI2NERQQkVOVFJZICpkc3Qs IGNvbnN0IEgyNjRQaWN0dXJlICpzcmMsCiAgICAgICAgICAgICAgICAgICAgIGludCBmcmFtZV9p ZHgpCiB7Ci0gICAgRnJhbWVEZWNvZGVEYXRhICpmZGQgPSAoRnJhbWVEZWNvZGVEYXRhKilzcmMt PmYtPnByaXZhdGVfcmVmLT5kYXRhOworICAgIEZyYW1lRGVjb2RlRGF0YSAqZmRkID0gc3JjLT5m LT5wcml2YXRlX3JlZjsKICAgICBjb25zdCBOVkRFQ0ZyYW1lICpjZiA9IGZkZC0+aHdhY2NlbF9w cml2OwogCiAgICAgZHN0LT5QaWNJZHggICAgICAgICAgICAgPSBjZiA/IGNmLT5pZHggOiAtMTsK QEAgLTY1LDcgKzY1LDcgQEAgc3RhdGljIGludCBudmRlY19oMjY0X3N0YXJ0X2ZyYW1lKEFWQ29k ZWNDb250ZXh0ICphdmN0eCwKICAgICBpZiAocmV0IDwgMCkKICAgICAgICAgcmV0dXJuIHJldDsK IAotICAgIGZkZCA9IChGcmFtZURlY29kZURhdGEqKWgtPmN1cl9waWNfcHRyLT5mLT5wcml2YXRl X3JlZi0+ZGF0YTsKKyAgICBmZGQgPSBoLT5jdXJfcGljX3B0ci0+Zi0+cHJpdmF0ZV9yZWY7CiAg ICAgY2YgID0gKE5WREVDRnJhbWUqKWZkZC0+aHdhY2NlbF9wcml2OwogCiAgICAgKnBwID0gKENV VklEUElDUEFSQU1TKSB7CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL252ZGVjX2hldmMuYyBiL2xp YmF2Y29kZWMvbnZkZWNfaGV2Yy5jCmluZGV4IGUwMWNlNGM3ODIuLmYwNzE0ODBiMjYgMTAwNjQ0 Ci0tLSBhL2xpYmF2Y29kZWMvbnZkZWNfaGV2Yy5jCisrKyBiL2xpYmF2Y29kZWMvbnZkZWNfaGV2 Yy5jCkBAIC0zNCw3ICszNCw3IEBACiAKIHN0YXRpYyB2b2lkIGRwYl9hZGQoQ1VWSURIRVZDUElD UEFSQU1TICpwcCwgaW50IGlkeCwgY29uc3QgSEVWQ0ZyYW1lICpzcmMpCiB7Ci0gICAgRnJhbWVE ZWNvZGVEYXRhICpmZGQgPSAoRnJhbWVEZWNvZGVEYXRhKilzcmMtPmYtPnByaXZhdGVfcmVmLT5k YXRhOworICAgIEZyYW1lRGVjb2RlRGF0YSAqZmRkID0gc3JjLT5mLT5wcml2YXRlX3JlZjsKICAg ICBjb25zdCBOVkRFQ0ZyYW1lICpjZiA9IGZkZC0+aHdhY2NlbF9wcml2OwogCiAgICAgcHAtPlJl ZlBpY0lkeFtpZHhdICAgICAgPSBjZiA/IGNmLT5pZHggOiAtMTsKQEAgLTg5LDcgKzg5LDcgQEAg c3RhdGljIGludCBudmRlY19oZXZjX3N0YXJ0X2ZyYW1lKEFWQ29kZWNDb250ZXh0ICphdmN0eCwK ICAgICBpZiAocmV0IDwgMCkKICAgICAgICAgcmV0dXJuIHJldDsKIAotICAgIGZkZCA9IChGcmFt ZURlY29kZURhdGEqKXMtPmN1cl9mcmFtZS0+Zi0+cHJpdmF0ZV9yZWYtPmRhdGE7CisgICAgZmRk ID0gcy0+Y3VyX2ZyYW1lLT5mLT5wcml2YXRlX3JlZjsKICAgICBjZiAgPSAoTlZERUNGcmFtZSop ZmRkLT5od2FjY2VsX3ByaXY7CiAKICAgICAqcHAgPSAoQ1VWSURQSUNQQVJBTVMpIHsKZGlmZiAt LWdpdCBhL2xpYmF2Y29kZWMvbnZkZWNfbWpwZWcuYyBiL2xpYmF2Y29kZWMvbnZkZWNfbWpwZWcu YwppbmRleCA4NTA2MzRiZjFhLi5iNDhlYjczY2ZhIDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL252 ZGVjX21qcGVnLmMKKysrIGIvbGliYXZjb2RlYy9udmRlY19tanBlZy5jCkBAIC00Myw3ICs0Myw3 IEBAIHN0YXRpYyBpbnQgbnZkZWNfbWpwZWdfc3RhcnRfZnJhbWUoQVZDb2RlY0NvbnRleHQgKmF2 Y3R4LCBjb25zdCB1aW50OF90ICpidWZmZXIsCiAgICAgaWYgKHJldCA8IDApCiAgICAgICAgIHJl dHVybiByZXQ7CiAKLSAgICBmZGQgPSAoRnJhbWVEZWNvZGVEYXRhKiljdXJfZnJhbWUtPnByaXZh dGVfcmVmLT5kYXRhOworICAgIGZkZCA9IGN1cl9mcmFtZS0+cHJpdmF0ZV9yZWY7CiAgICAgY2Yg ID0gKE5WREVDRnJhbWUqKWZkZC0+aHdhY2NlbF9wcml2OwogCiAgICAgKnBwID0gKENVVklEUElD UEFSQU1TKSB7CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL252ZGVjX21wZWcxMi5jIGIvbGliYXZj b2RlYy9udmRlY19tcGVnMTIuYwppbmRleCA5OWIyYjE0ZjFmLi4yZTljNDEzYjFkIDEwMDY0NAot LS0gYS9saWJhdmNvZGVjL252ZGVjX21wZWcxMi5jCisrKyBiL2xpYmF2Y29kZWMvbnZkZWNfbXBl ZzEyLmMKQEAgLTQ3LDcgKzQ3LDcgQEAgc3RhdGljIGludCBudmRlY19tcGVnMTJfc3RhcnRfZnJh bWUoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBjb25zdCB1aW50OF90ICpidWZmZXIKICAgICBpZiAo cmV0IDwgMCkKICAgICAgICAgcmV0dXJuIHJldDsKIAotICAgIGZkZCA9IChGcmFtZURlY29kZURh dGEqKWN1cl9mcmFtZS0+cHJpdmF0ZV9yZWYtPmRhdGE7CisgICAgZmRkID0gY3VyX2ZyYW1lLT5w cml2YXRlX3JlZjsKICAgICBjZiAgPSAoTlZERUNGcmFtZSopZmRkLT5od2FjY2VsX3ByaXY7CiAK ICAgICAqcHAgPSAoQ1VWSURQSUNQQVJBTVMpIHsKZGlmZiAtLWdpdCBhL2xpYmF2Y29kZWMvbnZk ZWNfbXBlZzQuYyBiL2xpYmF2Y29kZWMvbnZkZWNfbXBlZzQuYwppbmRleCA4MGRhMTFiNWIxLi4y MWVlMTIzOTk2IDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL252ZGVjX21wZWc0LmMKKysrIGIvbGli YXZjb2RlYy9udmRlY19tcGVnNC5jCkBAIC00Niw3ICs0Niw3IEBAIHN0YXRpYyBpbnQgbnZkZWNf bXBlZzRfc3RhcnRfZnJhbWUoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBjb25zdCB1aW50OF90ICpi dWZmZXIsCiAgICAgaWYgKHJldCA8IDApCiAgICAgICAgIHJldHVybiByZXQ7CiAKLSAgICBmZGQg PSAoRnJhbWVEZWNvZGVEYXRhKiljdXJfZnJhbWUtPnByaXZhdGVfcmVmLT5kYXRhOworICAgIGZk ZCA9IGN1cl9mcmFtZS0+cHJpdmF0ZV9yZWY7CiAgICAgY2YgID0gKE5WREVDRnJhbWUqKWZkZC0+ aHdhY2NlbF9wcml2OwogCiAgICAgKnBwID0gKENVVklEUElDUEFSQU1TKSB7CmRpZmYgLS1naXQg YS9saWJhdmNvZGVjL252ZGVjX3ZjMS5jIGIvbGliYXZjb2RlYy9udmRlY192YzEuYwppbmRleCAw NjY4ODYzY2I0Li42NzFjMWVkNWViIDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL252ZGVjX3ZjMS5j CisrKyBiL2xpYmF2Y29kZWMvbnZkZWNfdmMxLmMKQEAgLTQ2LDcgKzQ2LDcgQEAgc3RhdGljIGlu dCBudmRlY192YzFfc3RhcnRfZnJhbWUoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBjb25zdCB1aW50 OF90ICpidWZmZXIsIHUKICAgICBpZiAocmV0IDwgMCkKICAgICAgICAgcmV0dXJuIHJldDsKIAot ICAgIGZkZCA9IChGcmFtZURlY29kZURhdGEqKWN1cl9mcmFtZS0+cHJpdmF0ZV9yZWYtPmRhdGE7 CisgICAgZmRkID0gY3VyX2ZyYW1lLT5wcml2YXRlX3JlZjsKICAgICBjZiAgPSAoTlZERUNGcmFt ZSopZmRkLT5od2FjY2VsX3ByaXY7CiAKICAgICAqcHAgPSAoQ1VWSURQSUNQQVJBTVMpIHsKZGlm ZiAtLWdpdCBhL2xpYmF2Y29kZWMvbnZkZWNfdnA4LmMgYi9saWJhdmNvZGVjL252ZGVjX3ZwOC5j CmluZGV4IGZmM2IzZjI1OWMuLmIwNTJhOGFkODcgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMvbnZk ZWNfdnA4LmMKKysrIGIvbGliYXZjb2RlYy9udmRlY192cDguYwpAQCAtNDgsNyArNDgsNyBAQCBz dGF0aWMgaW50IG52ZGVjX3ZwOF9zdGFydF9mcmFtZShBVkNvZGVjQ29udGV4dCAqYXZjdHgsIGNv bnN0IHVpbnQ4X3QgKmJ1ZmZlciwgdQogICAgIGlmIChyZXQgPCAwKQogICAgICAgICByZXR1cm4g cmV0OwogCi0gICAgZmRkID0gKEZyYW1lRGVjb2RlRGF0YSopY3VyX2ZyYW1lLT5wcml2YXRlX3Jl Zi0+ZGF0YTsKKyAgICBmZGQgPSBjdXJfZnJhbWUtPnByaXZhdGVfcmVmOwogICAgIGNmICA9IChO VkRFQ0ZyYW1lKilmZGQtPmh3YWNjZWxfcHJpdjsKIAogICAgICpwcCA9IChDVVZJRFBJQ1BBUkFN UykgewpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9udmRlY192cDkuYyBiL2xpYmF2Y29kZWMvbnZk ZWNfdnA5LmMKaW5kZXggZTE5NjM5MWM2ZC4uMjE0NTVhOGZhMiAxMDA2NDQKLS0tIGEvbGliYXZj b2RlYy9udmRlY192cDkuYworKysgYi9saWJhdmNvZGVjL252ZGVjX3ZwOS5jCkBAIC00Nyw3ICs0 Nyw3IEBAIHN0YXRpYyBpbnQgbnZkZWNfdnA5X3N0YXJ0X2ZyYW1lKEFWQ29kZWNDb250ZXh0ICph dmN0eCwgY29uc3QgdWludDhfdCAqYnVmZmVyLCB1CiAgICAgaWYgKHJldCA8IDApCiAgICAgICAg IHJldHVybiByZXQ7CiAKLSAgICBmZGQgPSAoRnJhbWVEZWNvZGVEYXRhKiljdXJfZnJhbWUtPnBy aXZhdGVfcmVmLT5kYXRhOworICAgIGZkZCA9IGN1cl9mcmFtZS0+cHJpdmF0ZV9yZWY7CiAgICAg Y2YgID0gKE5WREVDRnJhbWUqKWZkZC0+aHdhY2NlbF9wcml2OwogCiAgICAgKnBwID0gKENVVklE UElDUEFSQU1TKSB7CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL3ZpZGVvdG9vbGJveC5jIGIvbGli YXZjb2RlYy92aWRlb3Rvb2xib3guYwppbmRleCBhNjA2YzI5ZGVkLi5lYzE3ODNmN2Q1IDEwMDY0 NAotLS0gYS9saWJhdmNvZGVjL3ZpZGVvdG9vbGJveC5jCisrKyBiL2xpYmF2Y29kZWMvdmlkZW90 b29sYm94LmMKQEAgLTE2Nyw3ICsxNjcsNyBAQCBpbnQgZmZfdmlkZW90b29sYm94X2FsbG9jX2Zy YW1lKEFWQ29kZWNDb250ZXh0ICphdmN0eCwgQVZGcmFtZSAqZnJhbWUpCiAgICAgfQogICAgIGZy YW1lLT5idWZbMF0gPSBidWY7CiAKLSAgICBmZGQgPSAoRnJhbWVEZWNvZGVEYXRhKilmcmFtZS0+ cHJpdmF0ZV9yZWYtPmRhdGE7CisgICAgZmRkID0gZnJhbWUtPnByaXZhdGVfcmVmOwogICAgIGZk ZC0+cG9zdF9wcm9jZXNzID0gdmlkZW90b29sYm94X3Bvc3Rwcm9jX2ZyYW1lOwogCiAgICAgZnJh bWUtPndpZHRoICA9IGF2Y3R4LT53aWR0aDsKZGlmZiAtLWdpdCBhL2xpYmF2dXRpbC9mcmFtZS5j IGIvbGliYXZ1dGlsL2ZyYW1lLmMKaW5kZXggNDkyYjQ2N2ViZC4uMjcxZGQzN2FmMiAxMDA2NDQK LS0tIGEvbGliYXZ1dGlsL2ZyYW1lLmMKKysrIGIvbGliYXZ1dGlsL2ZyYW1lLmMKQEAgLTE5LDEy ICsxOSwxMSBAQAogI2luY2x1ZGUgImNoYW5uZWxfbGF5b3V0LmgiCiAjaW5jbHVkZSAiYXZhc3Nl cnQuaCIKICNpbmNsdWRlICJidWZmZXIuaCIKLSNpbmNsdWRlICJjb21tb24uaCIKLSNpbmNsdWRl ICJjcHUuaCIKICNpbmNsdWRlICJkaWN0LmgiCiAjaW5jbHVkZSAiZnJhbWUuaCIKICNpbmNsdWRl ICJpbWd1dGlscy5oIgogI2luY2x1ZGUgIm1lbS5oIgorI2luY2x1ZGUgInJlZnN0cnVjdC5oIgog I2luY2x1ZGUgInNhbXBsZWZtdC5oIgogI2luY2x1ZGUgImh3Y29udGV4dC5oIgogCkBAIC0zMTgs OCArMzE3LDYgQEAgaW50IGF2X2ZyYW1lX2dldF9idWZmZXIoQVZGcmFtZSAqZnJhbWUsIGludCBh bGlnbikKIAogc3RhdGljIGludCBmcmFtZV9jb3B5X3Byb3BzKEFWRnJhbWUgKmRzdCwgY29uc3Qg QVZGcmFtZSAqc3JjLCBpbnQgZm9yY2VfY29weSkKIHsKLSAgICBpbnQgcmV0OwotCiAjaWYgRkZf QVBJX0ZSQU1FX0tFWQogRkZfRElTQUJMRV9ERVBSRUNBVElPTl9XQVJOSU5HUwogICAgIGRzdC0+ a2V5X2ZyYW1lICAgICAgICAgICAgICA9IHNyYy0+a2V5X2ZyYW1lOwpAQCAtMzkzLDkgKzM5MCw4 IEBAIEZGX0VOQUJMRV9ERVBSRUNBVElPTl9XQVJOSU5HUwogICAgICAgICBhdl9kaWN0X2NvcHko JnNkX2RzdC0+bWV0YWRhdGEsIHNkX3NyYy0+bWV0YWRhdGEsIDApOwogICAgIH0KIAotICAgIHJl dCA9IGF2X2J1ZmZlcl9yZXBsYWNlKCZkc3QtPm9wYXF1ZV9yZWYsIHNyYy0+b3BhcXVlX3JlZik7 Ci0gICAgcmV0IHw9IGF2X2J1ZmZlcl9yZXBsYWNlKCZkc3QtPnByaXZhdGVfcmVmLCBzcmMtPnBy aXZhdGVfcmVmKTsKLSAgICByZXR1cm4gcmV0OworICAgIGF2X3JlZnN0cnVjdF9yZXBsYWNlKCZk c3QtPnByaXZhdGVfcmVmLCBzcmMtPnByaXZhdGVfcmVmKTsKKyAgICByZXR1cm4gYXZfYnVmZmVy X3JlcGxhY2UoJmRzdC0+b3BhcXVlX3JlZiwgc3JjLT5vcGFxdWVfcmVmKTsKIH0KIAogaW50IGF2 X2ZyYW1lX3JlZihBVkZyYW1lICpkc3QsIGNvbnN0IEFWRnJhbWUgKnNyYykKQEAgLTYzNyw3ICs2 MzMsNyBAQCB2b2lkIGF2X2ZyYW1lX3VucmVmKEFWRnJhbWUgKmZyYW1lKQogICAgIGF2X2J1ZmZl cl91bnJlZigmZnJhbWUtPmh3X2ZyYW1lc19jdHgpOwogCiAgICAgYXZfYnVmZmVyX3VucmVmKCZm cmFtZS0+b3BhcXVlX3JlZik7Ci0gICAgYXZfYnVmZmVyX3VucmVmKCZmcmFtZS0+cHJpdmF0ZV9y ZWYpOworICAgIGF2X3JlZnN0cnVjdF91bnJlZigmZnJhbWUtPnByaXZhdGVfcmVmKTsKIAogICAg IGlmIChmcmFtZS0+ZXh0ZW5kZWRfZGF0YSAhPSBmcmFtZS0+ZGF0YSkKICAgICAgICAgYXZfZnJl ZXAoJmZyYW1lLT5leHRlbmRlZF9kYXRhKTsKZGlmZiAtLWdpdCBhL2xpYmF2dXRpbC9mcmFtZS5o IGIvbGliYXZ1dGlsL2ZyYW1lLmgKaW5kZXggNDkyNjBhZTJkZC4uMzNhODA4YWM5YyAxMDA2NDQK LS0tIGEvbGliYXZ1dGlsL2ZyYW1lLmgKKysrIGIvbGliYXZ1dGlsL2ZyYW1lLmgKQEAgLTgwMSwx NyArODAxLDEzIEBAIHR5cGVkZWYgc3RydWN0IEFWRnJhbWUgewogICAgICAqLwogCiAgICAgLyoq Ci0gICAgICogQVZCdWZmZXJSZWYgZm9yIGludGVybmFsIHVzZSBieSBhIHNpbmdsZSBsaWJhdiog bGlicmFyeS4KKyAgICAgKiBSZWZTdHJ1Y3QgcmVmZXJlbmNlIGZvciBpbnRlcm5hbCB1c2UgYnkg YSBzaW5nbGUgbGliYXYqIGxpYnJhcnkuCiAgICAgICogTXVzdCBub3QgYmUgdXNlZCB0byB0cmFu c2ZlciBkYXRhIGJldHdlZW4gbGlicmFyaWVzLgogICAgICAqIEhhcyB0byBiZSBOVUxMIHdoZW4g b3duZXJzaGlwIG9mIHRoZSBmcmFtZSBsZWF2ZXMgdGhlIHJlc3BlY3RpdmUgbGlicmFyeS4KICAg ICAgKgotICAgICAqIENvZGUgb3V0c2lkZSB0aGUgRkZtcGVnIGxpYnMgc2hvdWxkIG5ldmVyIGNo ZWNrIG9yIGNoYW5nZSB0aGUgY29udGVudHMgb2YgdGhlIGJ1ZmZlciByZWYuCi0gICAgICoKLSAg ICAgKiBGRm1wZWcgY2FsbHMgYXZfYnVmZmVyX3VucmVmKCkgb24gaXQgd2hlbiB0aGUgZnJhbWUg aXMgdW5yZWZlcmVuY2VkLgotICAgICAqIGF2X2ZyYW1lX2NvcHlfcHJvcHMoKSBjYWxscyBjcmVh dGUgYSBuZXcgcmVmZXJlbmNlIHdpdGggYXZfYnVmZmVyX3JlZigpCi0gICAgICogZm9yIHRoZSB0 YXJnZXQgZnJhbWUncyBwcml2YXRlX3JlZiBmaWVsZC4KKyAgICAgKiBDb2RlIG91dHNpZGUgdGhl IEZGbXBlZyBsaWJzIG11c3QgbmV2ZXIgY2hlY2sgb3IgY2hhbmdlIHByaXZhdGVfcmVmLgogICAg ICAqLwotICAgIEFWQnVmZmVyUmVmICpwcml2YXRlX3JlZjsKKyAgICB2b2lkICpwcml2YXRlX3Jl ZjsKIAogICAgIC8qKgogICAgICAqIENoYW5uZWwgbGF5b3V0IG9mIHRoZSBhdWRpbyBkYXRhLgot LSAKMi40NS4yCgo= --------------8LeAoqG8dwrQzy06wXKU2COK Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --------------8LeAoqG8dwrQzy06wXKU2COK--