From patchwork Sun Mar 12 18:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40649 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1175851pzb; Sun, 12 Mar 2023 11:16:03 -0700 (PDT) X-Google-Smtp-Source: AK7set/map3mvxE78cC8AJTgV/q7aWlxzesylF+fL0mzR3AXeXV0ie3mmKjyFSpLL5f/tUp0fRnx X-Received: by 2002:a17:906:6897:b0:928:2419:de6e with SMTP id n23-20020a170906689700b009282419de6emr1302186ejr.51.1678644963706; Sun, 12 Mar 2023 11:16:03 -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 w6-20020a1709064a0600b00926eb6ce4cfsi1808423eju.198.2023.03.12.11.16.03; Sun, 12 Mar 2023 11:16:03 -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=BxXxyI9o; 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 615B668B63F; Sun, 12 Mar 2023 20:15:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2093.outbound.protection.outlook.com [40.92.74.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58C016899EA for ; Sun, 12 Mar 2023 20:15:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GUHA4xMxgoEzSFQVkVB5fU04gUqFrkz0/ur+ba2uHby6Ff05MaKjUK/Rp5Gs3rHRswwyL1K4ms1fZ0+n8C+6qy3yeINDp72phNGn96pT6FlpCI9w/NX0m0QScDDP7BtySxmHsXOanipZgfZGquTCZdMPIhN8Qll7lqq0q3hPigQr/rQuOJjDDwiFduCXSr4xHJ/d7JFOnTqGN5ozPtHKQ1OUOtdTQe+TBmgEtlKhg/vYC83rF7uq9KGmLVO3Hrx20AaLnnS4tPFiyIh78uG+CAZHq4nutInU77SaKxzS6SwhXXNfbR1fo1oT1B1syjMz51b8HPGVSRJjoP6gWje5Pw== 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=2CVahsMrRMsbASm+u1zZWblOsOwiE9WEzt7tOAUOmQw=; b=Kwq9KTpfSGGeYOhQy+x++5zWNlSt8vo9DjoIcKiNKPK2TJiMqyeGc+6I15Vtc6M24lAMOJHB/iF3VyVSsxAehAs21KHhldR8NcEdWK8VtRuxaGmLOHed8pgiQnPcVN5C+RluP6H5iyTk+FwJthvd+1FKvxkskV0m6HwK231ZGH84bYDrhy3ozmwVqfz/QyrBUdHJV8ZMtZm6hcySmWemf+ZPYgKPkCJ4pv20Paki0QyypHbY9Niw/ZrGIV1WEhJUc479ubLEM8Cygb2Qfn2OEJi6x8Nr9W6GVwHbDeFbpursb8sXqAsX62x9ReHtvZTRvq1UgBGWPMCkrcuKGNwtgw== 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=2CVahsMrRMsbASm+u1zZWblOsOwiE9WEzt7tOAUOmQw=; b=BxXxyI9ojJy/G3OOgCyjeOXifcWjAv/oAsu82i0ayhKJoSW9r86vCryo+chHtvcpwCsG6DA+FMwIP1gy+SwToTB3b/Nk/l8y7UqGDg8e+n4kGU9UrsRPixWc5ShL+H8wYg8sIroTTmL0O1S4YbMfeze83wu6kVTwaWG9Wg+8H6Qa2UbVRfvtjwUMZDJnTUuCS4i11NsZZGFU2GC61rqfyVJf2+JyQUEx7EV300Z5piBj9BlMmrNOPUGK7+jyJXkMcl3LblaN5oVoO5zVZQZCZcGkXt7g5QFWC22Bu/kt9qdwBUbU/PziG0KUrWcteuZhX//AbJV8d9/5enOiQIq+NQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0356.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Sun, 12 Mar 2023 18:15:50 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Sun, 12 Mar 2023 18:15:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2023 19:16:16 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [XM0kAP35FP/zbH88Wf2ftkBTYV9l9Uy8nhTqzmxJGLw=] X-ClientProxiedBy: ZR0P278CA0133.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230312181618.294557-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0356:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c152541-610b-48b3-7bc2-08db2325cf32 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9UznbWqNxqzZULgJAmDfbtqJLd+dDlvf8knNMGm41RgVppbyLofryIzyRgUe5iTrIFKNR5CuSxanbWfhUNB6MbTpUg6Hnpz4o4v33k8YEu4UmUflYgF87GnBZJuO3E38I1JPc3l+MRTJ76eAJ+VrVPolVBN0vpjfJXmpvoiPnKSl2+0gGkk3LBP9jckTfQgPbfR/i8kVb6zy6EXP3pEkfIKQv9vouE7M3RJYo5QzVe/RFSmgVJrpu1vc0bv6n8kgo9gbVFfey95LyjV3FY8Nfi98RUu7slLAE62Mb1JMSWdbJBf13SGbIrHgfM15wh3Ffh+DwmupdW1tfVsJXJ3xiHhcUbcFHJgMCViER0l2GDpR6jUETAFaooks4nLfPmzTA2wu8DwZae2qzl0wWNKZRwOL4fHHEMu6P2N5UQ2nvMKnCa2TkPZILW23JAH6Js+J2EmIM7QrEHARC0aEspq5IuVaCWBzrOug8JFWvd0LYQSxpPo7z3Xshc8Nl7M4HY+/7fHm5/LeNRNGVRhfSZeQGkhO7XXZG1h7iK0k0lUeLDYopHMEyTaii67IBXcWaFXN6sa9HsTdYESksYEMRAXwU0bKkbaBcduO8lv696hPAitiuWYzJtBbYtAiVEFyV98bHmzlHGba2shlQ13Paw23TZxEohmlmPrZAcBWGw1nIPwBu7sHtKUwsqR9ti3yCdrBVgp3wyV33eQXq6JMufNztH7qRHaWtZPe4oo+hhChqc/HMsTxg3d6JWxc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hyKM3evSPSBhxsWsHEheJiozgSIqGeTNRKOGYhNH49ESt8TtlsKnxSCYFjJeNABIZbjm2YHhWX+V69mjUobKqZ4sFU23S5J+JRZyrqul/zqHfcDuiKnbjh+MCFi/u/qWYJZRLzCS2PkFJPCXtBHIe4aruO0vdKYt3op55c74N01DhZYBAbefhM9/1b5k5ZEvv7QnJ+djnml8jTDSQ325IqXwQaZy81hMDycxQrEsJ9PzES6we/bbY5IInAVYD3+ri9+bt2L93I8odn2C0aORBIRxx96uslizPzrHatYKYECk3KTalAFVtNwx5TDznIsYczH3rU+oD7aLmwhcyK8cIJCHsJ3kwZAnAPb8CC4OeO8P+xHsoD0je9wfL5Y/RAyQpZ2CesiXgtxd/JbWf/GuKwy0VAx/VU1qhOKbOa2ZmUPyFpH+1+qZFA+JLLtDxqQDEMj+SgSF0uiRmmfUh1LVoyE7NT4fwf/OqfpXIrRF69/A6Y5vO3buMh0tcgEtizUDXeQxQSxw6r1dbVmvJQRnFqXZZwJ96yrCVudguHMpQDwUtb0s++dEifa2l8yLdFhm7rtVqrd+l0jKwMq7AzeBx9xVTt7YTUZIxDrOq3u+Hn9syzJYXD/i0WPxyy4E/lY0gnbq7uBDPC93rsOKeaCjLHpaXhc8GhaBFctm87bIr/o= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7KT3by+FLMK7dQruT9nfmPc8UWDs2jlgrK01TJIN6jfWSsmfocTqu6Ia9QLRrkZ276Gpd2F8UodWJ59xbfEFHclJQn0R528mLou+SpDD2WjlfkwzLXD7/9SZy2cD5I2s8cuvKFY++fKU9gn44zRk30x9PQZh1Z4esm1cZ9EdTS90sgApjHsK4fQjSVrlbLH95aIcWQxucHCLNZiz4CvzAU4bx9ZDgylK5Pvy+8N91qv/LbkpCGGAOMo85ElSlxhiQpxpF55eC2OjPMBLnr9qkoPb15DNenoJu4vBAmoBDpOukMXMK70c7fCKqZ4zYqfc9ZZNIgwgBO0ylFWo3VforaLSKNsBizROGuhcbaSxEMEdyMmpXqIXZLsFXUs97MZR5DLgC+D5o8FW2GTbXSCl/pZFInirA2y3f0xqO89wVugohbDprVh6IZm4PBdKJknXPx8dAHjvYM7LWjtbfh3tI81PmqEC9bNXRDPpQqmNOik+hO+SDasfqiMED/E1gkcrJvsezim8/xDoZYYeAvbWgC98L8bkYs1rU0HOySpJcIxcR9sftymjapLmB8b896FIkVGJphV9cX6PaIPkrsd7adBl9nx+XslHUcC8z5UptOwoQyscaU5gy+xgqeWdEfTph9HWYPiMbM0v8GR11/tKaJbNNuI2/2lzbWK1HtLUDbFlmqD5FKqMiddVVdYWj3dYr4J6ko9jflJInRMfv20XT7t0rT0UTCZClLeT81pGQ/wHwIPAnjws1hcwBS7BI9W1c7dCKR29wHG50a3CrGIlkFgHa2FZwiA8hW0xKASgOB7s0DQYaYXfCXlrQtkaNg6LrjCP29LHnUy5hzjhVBZWNzjE8Q0qT+KrOdX7d2g0g4WQ/nJ8StNMj1KgTfHk5MXWmn9+Nwo8dyx9Ifvucnv5Mvx5eN5NxsZV5ZIIM6MXZf9KEvIQ+raGXSRXIgsQiBf9f7lQyinzXOuehAhUV9CaDkQTsTxtbzCTE++q3Q3/hPRVFl/kq9DuBGDQ5S0YNenK30/t8paZas6VFSPxP1RRIUUmb35B5TBGrxUZ+JUFEBCAHTfo1EfrtME8TOzvsyD3A1PLuZ5XJ2aNjkjzFCSsXfexGUX4y+c6kifaXddb1ZUyFYWmkOsC0SSPGEdXdemTdL7fmIMCANsDZgRZmYmzrZpAGkOkFzgaCwJu6zWzvVX9qoq79UUzCu2cB7OTAs2At93qJqRC1sbrPC0uKWKZPfL0T9uxpXtmKcHqtP1N5PWX18R8BllKuqDg1IrLBujruOou4G+HKJaFSzK5dCngEmJZZ6DUUJrNv3gI1TukgwpgZnwCbGukN5IKJ0FYaQNa X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c152541-610b-48b3-7bc2-08db2325cf32 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2023 18:15:50.3739 (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: PR3P250MB0356 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/libxavs: Use frame_num instead of frame_number 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: JbsYHScZ/ubg Forgotten in 6b6f7db81932f94876ff4bcfd2da0582b8ab897e. Signed-off-by: Andreas Rheinhardt --- libavcodec/libxavs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 9ed73d1042..6c29539f24 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -141,7 +141,7 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt, x4->pic.i_pts = frame->pts; x4->pic.i_type = XAVS_TYPE_AUTO; - x4->pts_buffer[avctx->frame_number % (avctx->max_b_frames+1)] = frame->pts; + x4->pts_buffer[avctx->frame_num % (avctx->max_b_frames+1)] = frame->pts; } if (xavs_encoder_encode(x4->enc, &nal, &nnal, From patchwork Sun Mar 12 18:18:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40650 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1176998pzb; Sun, 12 Mar 2023 11:18:18 -0700 (PDT) X-Google-Smtp-Source: AK7set+BvKiH5lPPM+YM8JEQvn73fA8kpF0dI8v1oDerHb3rxbeaC67W9wNo1bQ/qzQc8oVdJazW X-Received: by 2002:a17:906:dfca:b0:878:7471:6da7 with SMTP id jt10-20020a170906dfca00b0087874716da7mr34827400ejc.66.1678645098607; Sun, 12 Mar 2023 11:18:18 -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 fi5-20020a170906da0500b008b27150c987si5152404ejb.15.2023.03.12.11.18.18; Sun, 12 Mar 2023 11:18:18 -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=TxFwfsT7; 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 B04F168B8C5; Sun, 12 Mar 2023 20:18:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2099.outbound.protection.outlook.com [40.92.74.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3EFA680969 for ; Sun, 12 Mar 2023 20:18:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TKbwXeof7wJ20MW70GnQPRAa/6N3KT3oGsFurHrXgG03OFILRO2dYriJ6Vt/gwyg4JJzo0jXZYAZHMtQggSt1k9z2hji9s/9Nem8Azl/yOvNa2fbdVyU9IHFJTYRf2xfQaVv8eZpR/nKZRJiKWkB8w1xHZRLvBarYqO65XkHhJ+U6dbuKPymvk+py3+WlqyPR0/GYb+1qR+MaRiUL08zHqfOSSPVSdN863/0i/VpHOqfCcF2HZ4KytdaNsr3Ww7HsJjrkOqYhQCaiEcOKP+YDZp9T6YfpnujIBM3WoeVK0zvNi3IcHYHO2YHDwT4eFQrFyGWERDcgazOWtFXcQUxcw== 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=zSN2xNx0qVK9mdgiddb1rwPE+mAGaZ2LfXNbY4tHmA8=; b=WGA2Bq0y+dTHb/Rf1OwDyGH/brzdGgV0Fg/3mJpeo3hJB80lvIoy1nbeiVy22ypZ7eX9pDlKuO4zKzKmW6FB1pYJ4qldG//MxcW2SNCLRfl4RHYC2XYpr/ltPFBT4bgrjGhOoCwUoavb9hY/ZEcLCPnB597m8x1hFHAsEBB7E90Gtv4tV+bPjR/y8IVLuJ3zbijOnZqQqhGV2YlpyleTPUmtwDjlyQAk3TXEdREF6q0rUGWX9N8XCwc9+aULZCjmPmNhjY1wEr7DToHZ7kdFZve2sFBNDK56TIdhHtqv5EoJJ4EOjx6nOnUTNAfQmkBsrVhHDVbrC9KAFAcycNQ3UQ== 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=zSN2xNx0qVK9mdgiddb1rwPE+mAGaZ2LfXNbY4tHmA8=; b=TxFwfsT7CS/bf0OzGG4/9Fk9Dv1o3DPi66kSQvZU0lN/JWr80rYP3O/zkozo0Xsxw0p3QzkcAQzqamovpyTSkEQGPmgRFMggDfVn31jHeJ4Lcopa/pROPJ8HyQ2sCsb8n9mClQT03HA0t8ch+0AWSbTLhFb1Uc85bkdrET6AhdwldeBOjPMc/ekxIAx0ZEE7HLrR0dy4jAwH5UKfrKAFjv/JSQzdnL0WZ58j65hTwXaue/GsB6nzX4Ly10c4rYc9aMat1yrlXXCiD0hLQNsVQaQnbsLfbLfHyXibsKUVJ18soGYCAC6ywKzIh2LIhCJ4kagXfZ8EVlJCa6n8DmUyXg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0356.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Sun, 12 Mar 2023 18:18:07 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Sun, 12 Mar 2023 18:18:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2023 19:18:34 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [RtUsWm8vvq/+5RP+fY4UvuUhBCaWUkrZudgyVs1DaFs=] X-ClientProxiedBy: ZR0P278CA0104.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230312181835.294642-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0356:EE_ X-MS-Office365-Filtering-Correlation-Id: 1281ed15-6364-4bbe-17e4-08db232620ef X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9UznbWqNxqzZUOElbp7AV4kZuZVNVBFF/9LOGjupyQmnNwAKPjD32W+vdzHpTsdKNuRCpNKF2pWoQlxnlqK2UPGzXgAXFV4OG6putn3sJxzZSsZcOFLI79PMJ5r3lg9kzrgGFxJX+tKFGn6Jn+hDa/kUJSjhrrHpb/IfaSPp9hxXVhiwgp/YK7sO2lZHSsKprfibKhngMJeIykAUsmQF9VLNU1LR3mUf+HVaaPSk4YVuEazwA/tyd0iBKvOpEceIk35KaxiI57vq/2enexSfY8ot8REkPw774tYCge3CjKM+4qU5+uiPvt96mWBhc8QDZM+7vqJANETQi2TKyeNjKywS3Bg3GCf+ZuHM2hNQ07IrL5X58GmY8pVWeD7fBTnHr4Dx6hzq5Uf10K81VHHK2aeY1sIqCV7ysmAp+nOn01E1fGdut+stbBYaDry8dAB5zHskI3aSaBK+Ios5PxH1H8G0wu7fSHkf93WkyfP9IqEwwffpmDMOPJSwxY8nc3dmMdXf+g7uWRCKZQq9HledeRMMp/AKUZzpnP5K1raFK0QZBhQsPAXkpWg6WKxD9LgPVk+h/zjyHfo1CV8rM8gAdMAAxOBRWoDf4QgJwPkJa175YtVZz8372Ij0txf0INkg7PzIRXAdkhRFfCXb71hzyPROrB4P8JqLG7hfTzvp9T5jyw17H7MXzVSrbyZha0JNnN/A4ia/iW5K047DbtsY932tw4x82eQ4oUYCjcIk1lUMlH4me3B43ctc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TTwtIb+qRAcNJ4WaDK1Hc7Kl5zzRdiwpsREnnRnft4Qw3xn45Xwa/Ne/tdN4KZwG5pnjRvztBrzBJnAQ1vcQMfmaAeSiZkmyDLRuHIHEgzf/vyMGG26SV+ObJD7EajbArhk1G1RgKjlmuCdNuUddGF4/5KNX003bx2qg/NNggsQ2rcgDRXIeTVtZbkIcem5+aDVqRF2MfN77xqdY/n5sR82MlS8O7LuQuDQ6/qmi1G094I7IcRnwt2OE6akGFLlky2s30xsCt3t2HgLTS/x34tJEo3cUdKzuDgL1RpydizfwGSCLZ46nk/VH0nprZDp6l0EtxBjo4jHDecMMC7vAqEbWCIDdhxYOC9912I6vTBKqswLncjV335FtibMSo3JrtLrRbMRefP5F47mAzLp+tFDOHWllc3NBiNGpdIQOZ83nGLSKmBGwkBVyaC37n8Rq87ZBqxC7FK6fk6i4lINXO71EB2+GETt6OF0CvCD5KIK4JvhxXKfGXCdtrC6BhakhUHTkjwUuh/qjXBHM52RZ48PN6cvapePGaT17Ss4RWVLwdnnZO1p2WuWbL+RNpoWjCNZbkiFxt80rj3tP/eceJuoX9YNhLbSrGLpicv6YdO6TnHyuOQQ01yUMYO786SkwaDMUnJUZct17JHo26cogJCCQeEeVozj/5XyYl4UPmm4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RJg/jeZbt9hEdVNGMutPI9u8McBO1g38TEvL5nxxpuhUyhm1KtiJ4gDJ4qUCCCRWNVygMa+M07PdwVSBHrPi+eAkr/zwwrQ367RR2tXMo5dPxirLrQk3v0MPigCbfj4yG24KtdqCCy8qg6o9QGJJQh9kpp2k63QH3gQLRQwJPgatpJ4x+Bh6Cz5A+scmjZ7etXeTMgNzRRmgVgHpWu9zHJQn106lG9+EE+0pHIJ9rc8otC8f3dRvRP03Htr5U76+6KvutO4/QrmCTIt3Qf3Sd9xUaoSyVYwIS3fSD1QRev/n935lXlQEbOpi7M2yj6O9vKubuPXacsnniycuzsItLTeYPowMrrpvep2PNrggw3qloWkXaXm5jL0sRk93kcwHTY41FMt04IAetfG9dkK/aH0mAlvXWwvDm2jH3Lwoa2OQgsKWrj4ln1xTepuK1b9rtwdq+P/ATFvXDIqets84C0zzX2eVyC9hn/LxdZK7CSzbvss9IWkN7A1dueEvIsNdzh4/VMIvNDsLebq4HAlkD7FSM1+ed7BwA4jiaj5ZEgAsYQXg0e4Tj2G5MPxvqJyx2fUXtfiRjqZ+Z8u3OA0AaCluWLm4X4otsRp0LulZ4jdTPXjqej06xGSueGg27YynGRRO7QPaI6Lbvk7v8OTm9dYGjduqgDUNWpq6AFZZ2rchg8xBIQXeoBg9KUJbpcnCCPkYTJyGCUkieZnNcF2x6wRxS85tjSXFriY0Albv0+pgpM0CCwfdfuAluj7VtY6NHJGwAxSDzR6Rr7dA0LI8fQrLVeFqe58itSjNsOZlIbVa0AObPLRRGGcAWRkf4GWjAHXcLSB/xztbZaDA+vm38XYbsOXivnswKcEFlxWy319PxlF+nZSNXpBhjLTBu2Ia5WOf8A4DxuvkbBv0BlUsELu5eu8AjsR9Up8sjsdxF0w3s6oVBPW9+h7bsRa7pd45GlxRL9QkD+xxdlcV5GXsZYjdO8HTRzy/1WpOpHPlWtZ4hFIFI+Vp/8WzjeVxycJfi/s96MpHmJTnJy8H06FLBtDpJYAt4VEeqSSA+ivIQwl5nC1oDvJeSJLF7iU3mryxflTkKthZwwsjEWf/9AadxqRTZ98wqszjaTjZLRhaklfJ7jA3bm2gJ0c5q7Jx2K2yxCs/G/rG2qfq6sIlPcDc76+vHWiKFIFr+hc4Xwh/xuAKir4KgsrlGTHP325XA7f+SEo8FOC4MmUtuQuhBGF8kNLkWXqHLHOYIes5M6Y/jpW+I12URR9J40u/6ecFj8mUz+EgtTdMCE2ERGC/7jqgW9oil269gOoom8XbDcdR4E8tIKV85JaIiUK46CZKMgAC X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1281ed15-6364-4bbe-17e4-08db232620ef X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2023 18:18:07.3368 (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: PR3P250MB0356 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/libopencore-amr: Use frame_number instead of frame_num 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: M5ceKfWAklu+ Forgotten in 6b6f7db81932f94876ff4bcfd2da0582b8ab897e. Signed-off-by: Andreas Rheinhardt --- libavcodec/libopencore-amr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index fd9e6e6343..641a156129 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -106,8 +106,8 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, AVFrame *frame, enum Mode dec_mode; int packet_size, ret; - ff_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n", - buf, buf_size, avctx->frame_number); + ff_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%"PRId64"!!\n", + buf, buf_size, avctx->frame_num); /* get output buffer */ frame->nb_samples = 160; From patchwork Sun Mar 12 18:18:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40651 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1177068pzb; Sun, 12 Mar 2023 11:18:27 -0700 (PDT) X-Google-Smtp-Source: AK7set+vYPlM7/0rt7ybdQBGnNd37YhXiWyFzE3aO8YZkpHJ9TqRaKxADN8cV6VchmA2i+Hyzb6G X-Received: by 2002:a17:907:9485:b0:8a9:f870:d259 with SMTP id dm5-20020a170907948500b008a9f870d259mr37160963ejc.48.1678645106994; Sun, 12 Mar 2023 11:18:26 -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 hp28-20020a1709073e1c00b00928b3b7d509si1200265ejc.90.2023.03.12.11.18.26; Sun, 12 Mar 2023 11:18:26 -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=DNGGEICO; 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 A63A968A8D2; Sun, 12 Mar 2023 20:18:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2044.outbound.protection.outlook.com [40.92.49.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9332168B09D for ; Sun, 12 Mar 2023 20:18:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i0gxFXrV+wDuhBc+UyHFt+hC1Sh5r1UfO5F30gUx3iC7BdROy84yfu9QBlmg+SSpSS43edTDCp9ffmxyz+SVzIlBCVisEMdkxKX1dW+jVJPbXoqQA2gSEgxKyd6NaSSXKMyRrmsYvaT+iAYv99fuGLiT3lkwuJStgsSjjDuHUKaFgGtkfeiFGbKTq6zxcXgt199UEQBOcQ0OAoOUMAY6/1dEFPbBXZcvbQrfqpHeAlVbZxDf9VK2ezL+LLeh5Nbc+fz4Aq15Wk4oNGyKge2CPPzKw1RlZ96XD479dAcQ1kqmb4GU6j7LQ/AM7uLQjuJpP3qpVsB1uqglIYkcSnTm+A== 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=ZkQ6UPYnRbXiPqzfqAgma15FCbUr4XTbWHFXGllqSuA=; b=Eo5Bbod1C71o+bE6pCB+641Wk7TqjmFGBP0eICGnhrz9QHoa48MDOrTQQdDZCFtZVqeSj0amdOzYcPP3WG39rfe2UpibHO800qUoyZpuGweh5YJ5mMfLsOTFklDLOXV1gSgD3llhNkgMuBadjIbpYaSzIIguAxzy80UPaqeu9coryvPOOsOn+f0OcPV8QnsM2IYb2ssCHH0Drl/uVIl/DuOBSXnqS/nltYvlmRyP4ZTIQ4QkcwLmyHn/zZ8l2ieZlcPkYm+N0LFXZhMfM6CwHZaq4cHzzaDbr6AsS7W163oG8bjWQ8PA0LZ+3RB74McF/fM+odITrQFlAats1zY8+A== 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=ZkQ6UPYnRbXiPqzfqAgma15FCbUr4XTbWHFXGllqSuA=; b=DNGGEICONruR0aPDY2PeVawT2qEPB1BwsjoAOg4jjW1TzXkuYzh5D6RsZGigPXoSG5sHZizs7jnhcWrSsz4Kw5wY07080VGmmUtF04iP4h6WVLFf/LeFJRgo6bfJsw80SkM9Ts8p/e+esx1hWYfkYLJkq3jJ8HAPDvHpa5ny4/zU9OGf1ml3j1/TLYKov/X6T0QIDRAFCfFr4AdsFikXkQ9ERllVIh/ffW2HB73L18tW6meQG+w0/LN63aSVfpJnuYWYBRmZmOMXTE4Ci5S1lxk7O6TmVP+4G3Y0ueLwhs4BX9Lvw1P5GzQfFHqLXTLRLAce/VpAS0FyXooX56dl+g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Sun, 12 Mar 2023 18:18:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Sun, 12 Mar 2023 18:18:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2023 19:18:35 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1fuVU7BDLfFN1+30EITp2n3rSxHqgQuSnisqEbr6wrI=] X-ClientProxiedBy: ZR0P278CA0104.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230312181835.294642-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0052:EE_ X-MS-Office365-Filtering-Correlation-Id: 717f8452-a78e-457c-975f-08db232624e4 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9UznbWqNxqzZUVG6uyystQY0C9zvzX4Wpvsc0CPPHaYfIwWojaL58LWzC4YNYZrV+88xvKD/VM7qNlem41V2LLJo4DC3RXhNe/AyCTroEU3arW+x6j2bCkFvoKoMADRj4gZFmv2rjzV2gyQCK//g8OacbnXFN/upfKnu+R9obGIBW7N+LGQpNWtsKyhco2ws8J1kKVcJoEWDpybNuQheg6ilSdL4VwoZpRQ0GPSOoCKFRcFt+zt837ryR07zl4uhsDn3LEHaR2E+0LPv80INrP7HuQ57U/+RzXyqEoTni0Wco9v4Si/X/nKJI/0YtFlVGtHal+Ov7ovWPc3ooZ8ajk/WHcbHAHhbxny00UtrPOQ/W/aToIaWD0l6bREMDv8p+RltVzS7H+81i7R/M/yisyaOn91EsmbWvfWIazJDzv3/e+fggPwWCviHi/blN4Q4mchQiIqSLzW/tapsfAqsxeaxJup/5Il1x6Ydm5vKGCJhI3G5GGRRC4DLAfrVWZ5ubnn4RqBpOnRtDFLRNK0DUZe+8dM2wgpdCg2xVNdeRIPNQ3JS5z+Jb+UGIQ35baySch6cke9MqRFfrN5DK3CYIYgDm5QVyQtNo8QHw5RS79GuXfKkiXLF5hcqfa2yvVD8HybhenR6/5IqJ+g4dQb8EqVay+8dP8dIi269C5PB5lJn7KEm2VlWEafvR+8IETi9QF2dDoIAk9vYl+ZA9op2e8l5wg1wNgeV8znF168dlmuKJizLCtMaKEnU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bbz0YDC4PGhcagfhDz3h9ftq5QqMtmX2fQWhUqNJnAIaBYgcbf+8HoK9CeyRNY/KcEwkm6DDiWTBbqfP7aSTLOsx/tSWmzI2R2yCN9J9LGGm6GW1qTzJvqt+d2AOFg7fFXfjW2NVBtlTvhB2A5NQx1UMYbvEdYn9pk7MdIG01Zpzo9EUsqYqNxdYmMvh2YcPkvEMWOXa00NVD1d4Ga5lAYashHEMCWSZph9Weux1YiPzm5s7xswMdhzCRMAAIkwtux93vR3sAGyDDZZRlVG3MHB1ciTRhWbVucnN4XgFCqKLvJjz8gIlbz1xGYhHkBUOwOnDKMuP+R5lNxxrdKEkf1qGEKAojZHMHzG9yV1S4i30uI9ujstA9+VYNfDo4RyB9PPJV/rG/LNq1MG351Eh+Fu3NjhH/sREAByccugkYhD7JBWvj+9a6KZ7l9jpCWTnpeVvJd81LQAhvKQrTkNDQeSlWcoW+W2Xzizpqnw9UP+/9aqSC0yPxt5s6qT5sci/qyr5csY54dHrNu30kJedpCMR87J9auPTE9UykFTJMInaiD9H8s986kM3lTOnLSN8ld9Wwopm2H3/R6SQLLFMuWQyB4L3WnI/2tO9UW7QxRyo7XBdWH1GBjGNpcILlv9EgzWdNvLFSdj5leJ/ZaB5SQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: D7aKbAvEkij52qMqJDybRLvgL9/XGj0usyeXRb+lbYRZzlKOHwCvNEq0sVrBgJ9lAIQQYhrC69k+z72LuJzxfg9pi9CXggGV+0c1oW80HBFdssTJRB+qH+x2jJ7xaHCj3bwqydcqtwaX7sPw1F3oUtEDjFlB6hLskbDz9Al2pDD6s1u6KWCplosxn1/dvvZe5GRHrkCb8MgZSrD7+L55eVX6yCcZgzCjIPVILGeRfH34wUNBPfTNQqDTCx/VvQV6TXa9wQ7GA4uJcy+bxaYS9v9Y2L1NmO0/a0rCbAcJvhP+HKW6TDIUduQspZRKaODwSa4L37zFgafYWjaNsu5qXqap8nSOAl4kB02iBdNbrg/dJyujoZX1ZfphOVzeS57iRrjxsw41qz3aXE6nMONHiIcQywwlCLwQoVtc3y2cVbPryXMMJ23m4AYwfY/JT2rSrOgPJJE8O4dfA4QDvSE8tL1JRuXiJJv0y150Aneud2qFrHYgFK7k+BQ1Z3ka4oCPgeACf8+myHPGspfBWp4o7Ts8GUHlrKS+AtZWhEzKCKDG/Ny+mUHEu3X+5TlUqLsXqJL1+BOJzP3d+2hI+Y55DJASVCN5/P/lDs2L/apJ+9+RopmhxmPWFWl0c8xu3Cp+qctKkUx8jH3VM3JQpKGw0LvWwVJ+pSyxWEUAxzVzOrg2d0dEjx01+zF/zmlFrgTxvnU+2ywM565yn5ywX6nlnpjln/ikQIVcfzSYfNmnlfNps7FLSkPRGinpCG4S0viArjBHTJEjNQZ1X1LsrxsKRa0TlCg/4c+clABck8oUQ8K6D1yea7bOSyPa1KeK5RUPUKsNCRCGAZYJQFi1i28QNtVxLLYmUHcrhgtV+KfBldUodVPlJWn+Rznl5tirZSP91MKp6nOqfcEPmqKN+zzuFCuXPvqxhLPeROQxzc4isEO/3+to7pt8wkwZY1SlWZgJ4OPniDDn77KKEJKA/XbMnsJgyGo4yMza1ptYZOtSZag8s5dayVnnZ+1d+ieDEg2W68IJ+iU37B2AtGGusfcSbQci41GK1ki4G7CymXAP7XPhhhG4EFrlUp3HMcH7dZBrcFVbkrILyk1WluNUwHmeN2oBtvMZ7uCFsEiw3GZOflst0N275qKArlDmhmVgp0smQHUiY5hDBTTx76vPQRPPTR0Fp6pyUu3A+gHCbQqmsLmI3oVvRkXpT+MXp/TypuJenp7UP2p43mrcRkfjG9ez9RZLPAT7MQQGAZDqbHuEbpYW38yEhJ6vBb8tZ9SWXCU2TBNFwc7Nx87w7/6qrsN6e81TOMRWL9d015ZRW4iSN2I= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 717f8452-a78e-457c-975f-08db232624e4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2023 18:18:13.9934 (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: PR3P250MB0052 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/libvpxdec: Constify VP9-decoder 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: E5i79NprfiuX Possible since 8d226fb9786f34760e80e0d6b403bd63e9ac4ddd. Signed-off-by: Andreas Rheinhardt --- libavcodec/allcodecs.c | 2 +- libavcodec/libvpxdec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index e593ad19af..385ee34803 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -798,7 +798,7 @@ extern const FFCodec ff_libvorbis_decoder; extern const FFCodec ff_libvpx_vp8_encoder; extern const FFCodec ff_libvpx_vp8_decoder; extern FFCodec ff_libvpx_vp9_encoder; -extern FFCodec ff_libvpx_vp9_decoder; +extern const FFCodec ff_libvpx_vp9_decoder; /* preferred over libwebp */ extern const FFCodec ff_libwebp_anim_encoder; extern const FFCodec ff_libwebp_encoder; diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 8e6291fe20..f480545ae0 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -377,7 +377,7 @@ static av_cold int vp9_init(AVCodecContext *avctx) return vpx_init(avctx, &ctx->decoder, vpx_codec_vp9_dx()); } -FFCodec ff_libvpx_vp9_decoder = { +const FFCodec ff_libvpx_vp9_decoder = { .p.name = "libvpx-vp9", CODEC_LONG_NAME("libvpx VP9"), .p.type = AVMEDIA_TYPE_VIDEO,