From patchwork Thu May 9 19:41:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 13047 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 21C94448A34 for ; Thu, 9 May 2019 22:41:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 017CF6899CC; Thu, 9 May 2019 22:41:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065070.outbound.protection.outlook.com [40.92.65.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D668680714 for ; Thu, 9 May 2019 22:41:14 +0300 (EEST) Received: from DB5EUR01FT022.eop-EUR01.prod.protection.outlook.com (10.152.4.57) by DB5EUR01HT164.eop-EUR01.prod.protection.outlook.com (10.152.5.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1856.11; Thu, 9 May 2019 19:41:13 +0000 Received: from DB8PR03MB5898.eurprd03.prod.outlook.com (10.152.4.56) by DB5EUR01FT022.mail.protection.outlook.com (10.152.4.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1856.11 via Frontend Transport; Thu, 9 May 2019 19:41:13 +0000 Received: from DB8PR03MB5898.eurprd03.prod.outlook.com ([fe80::fc8e:9afe:1a49:c86d]) by DB8PR03MB5898.eurprd03.prod.outlook.com ([fe80::fc8e:9afe:1a49:c86d%3]) with mapi id 15.20.1878.019; Thu, 9 May 2019 19:41:13 +0000 From: Jonas Karlman To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 3/4] rkmppdec: Set AVDRMFrameDescriptor.format Thread-Index: AQHVBp8odjv+SgSfOEGHK1PPFBQOjA== Date: Thu, 9 May 2019 19:41:13 +0000 Message-ID: References: In-Reply-To: Accept-Language: sv-SE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR07CA0013.eurprd07.prod.outlook.com (2603:10a6:208:ac::26) To DB8PR03MB5898.eurprd03.prod.outlook.com (2603:10a6:10:e7::18) x-incomingtopheadermarker: OriginalChecksum:6F7F9C277231D93246B1CDD31FDEE8037D5AA8BF20819B86B735CCEA84993FE3; UpperCasedChecksum:22F3019917D26B09258EA66FC8B03C08B6C41C16203DE8F25A0A875FDED88E1F; SizeAsReceived:7452; Count:50 x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-tmn: [vrCrTcVbOspxHaV4cCvD5fOqfw+ZKdsA] x-microsoft-original-message-id: <20190509194102.1016-1-jonas@kwiboo.se> x-ms-publictraffictype: Email x-incomingheadercount: 50 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(5050001)(7020095)(20181119110)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:DB5EUR01HT164; x-ms-traffictypediagnostic: DB5EUR01HT164: x-microsoft-antispam-message-info: 5phHu4zqUNdBB1JzSlyHOsRYS4+1iF1CpWWXuoH8FgWV3aYaU8FahTUfsbQ3ybwIDd+WKFdDQsrahwvDrRVIwFfIb9SvWxLAKl7WB066dTUF6wlS1koW6fsradb4yrDP58rMOak3YreNkxyeYE6xUDEWfnt5cWmpO2w87Jrc9sGsYc5pzTXs6E3oBhBzOuRy MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 8e196b29-5031-4103-4b4d-08d6d4b64b09 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2019 19:41:13.1363 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR01HT164 Subject: [FFmpeg-devel] [PATCH 3/4] rkmppdec: Set AVDRMFrameDescriptor.format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Jonas Karlman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Jonas Karlman --- libavcodec/rkmppdec.c | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index 143d05bd51..3ea64d867e 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -419,6 +419,7 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame) goto fail; } + desc->format = drmformat; desc->nb_objects = 1; desc->objects[0].fd = mpp_buffer_get_fd(buffer); desc->objects[0].size = mpp_buffer_get_size(buffer);