From patchwork Tue Mar 22 12:32:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34885 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp670963uaj; Tue, 22 Mar 2022 05:33:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQYB0cha2gogjU9ROm5oMbVNAAT5d3YgbOoWMoVBdg1UYrmBRDMDBckYGet4mAh1EjAGU2 X-Received: by 2002:a17:907:8a1c:b0:6df:ecd6:b6ea with SMTP id sc28-20020a1709078a1c00b006dfecd6b6eamr12882842ejc.530.1647952389045; Tue, 22 Mar 2022 05:33:09 -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 hq4-20020a1709073f0400b006df76385f1csi9919156ejc.956.2022.03.22.05.33.08; Tue, 22 Mar 2022 05:33:09 -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=dhbduNxe; 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 2716A68B092; Tue, 22 Mar 2022 14:33:05 +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-oln040092074046.outbound.protection.outlook.com [40.92.74.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D2B9680588 for ; Tue, 22 Mar 2022 14:32:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kgiXXRl8nCMSnTZwvDg+CPM6eW13kFR54ys+NOmNFU4YWB/vQlsfo9Bx56kRKhWjfkxD8KT2MvjFa3aE6vz4GHc/dOGHCoiUGW6KU9aoYSlpvrygHQyIazHeeWehkSOe9DosnfjIOYZZ22EkbJqjVQlMhSe2fVJu8rZ/q+FZUDm2BenJfJazw6S/GxK71wieOnIsTVq4iIu3Tvh6QM7Gf066BGW6m7p9o3pbertDkUhbHzJLvAzGcjkrDTuzf0iuujcBiElGW/W/vwTQyJDwtWaJmW4y+wHbYb7XkIRjRfjlgzqibl9Bci/9C1kGab5az9JOnauTd7RqaRmGD3FmKw== 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=ihe0d3asWYPU8jJh4z9s8RIfneB4dEfvtfNPeEnsFLM=; b=kyogH0FFMKuGCm6/4LrRJSq1XMBeBUpz/4AfwCRIS0d/UFs/r/wUzyhJD+SvFBNKosNXvLTX+EUyNLJ43mWi8ITY+8nm2CTykm4e9YOypuU0QWTo+gwGmlVYviIjDZfqPzvQtGrg7baT5mqhQgGx9bjK4VwM0nIANQiNiFDOKmL1RysUSfK8RxctflhCBNV4GTJeIvd0wLN6JzO89u5v0LuJw6rfJM6e33tmcMz+MdUlrJ7YFlaK6I5yujY0lLzCYqOWH8b143dFRZBd31izryKg4FEWy3wo9KF9N7+2Ly1PSzgmsjTswj3V+xj7AfefNZ1wbBTRThVG8AmA94qRMw== 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=ihe0d3asWYPU8jJh4z9s8RIfneB4dEfvtfNPeEnsFLM=; b=dhbduNxerGIqBgTDAFH91sR+nxhjS1gdQoHmzLdS36lXBCePoO4MI1T9bYBbKrDrZz7riBp6WT8d49E31CiRMAfKifGWYPOFGsGAZKN29g7GUMrVsOzAnLvi/yBcYI9Xpfb7HgeAjaIzCqfwvVOegaUj2Q/x0ziKYWTarLopIHQkGsJl3ZaGhJpl80bpzTjNLa6oR+TsVnZ5FsqeTvEXqdDEaeRGqHrcg59BAfwAlTHitSJ3vFnFE+Sw7yKB6zuzUBWAciABnWVleN4yD4DtDNQRI3TX8haRYpZRn0uRsZ52SOiZXLu0S2ZOSwyDcJ2JWUFnXwRDJBff16ijbEJNFA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by DB7PR01MB4888.eurprd01.prod.exchangelabs.com (2603:10a6:10:28::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.16; Tue, 22 Mar 2022 12:32:57 +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.022; Tue, 22 Mar 2022 12:32:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:32:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [ZTjGim16RWMY+AWSuwWXt1AkcQECiBc8] X-ClientProxiedBy: AS8P189CA0014.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:31f::34) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123248.348245-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3e2180b-fb0a-421c-1be3-08da0c001799 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuR8JRu/bs3HbiLUZ4BkXFvAJxYTPHL3jgCqy07uWvvJAR2neE3pd3tbM6n/U0hpbqqxpDZRSGMrBoCsMt+/tcx+kFE9Q5zeVxs1JniMs6lrAA7tRZ/uOFMeFHF9MeVkABi/1JFzQVc6LYijDlIlaXlUAjIqwi1lpymVdYGagBVEh3VHhPM+qEIdIC5vTszI5fhZQM7kBi//SbMuxzJOFO+8vMlsPiQ09acDn8Ym6dAseIK01K0ZVCqj+Y+OerpoTSZifX49YmmiDledS9i/A9LYL8xiVNmibDCKkIIOpaLW/goz9bF1+3J6XOouXQ59ESZSlqt/LltsTaMGdsI/swqaifna0BxrlzkzXALV/pJmZ6O+KMGFPuwn8tEZnQeXdbuzWAnosh+kcbZB1LPXh6bLNZIh/VHUB85jP6BSN6OkNSM1SYwxjyL8eWt7p7I6eXsdM6PK+rxqT5VHv6q82Wu7a7RU4C+EnL8BLAQMtiikYD3BrwMYb+Hez5csRXAQTLd4jEbnKWJodfhFIXQR7fKPtMkTckieQGalkQp0+IZ0ElMAgY18UfmEQiDelQpsHgBjsC80UCn1DNq/hMZnAAdauv+FxTb9bouAkO/4SvDPJgSgUR77Zen3Fl2moxeL1Yj1jgdpCWwUu2X3IewBJLJInilTvEyEC6RaGvcJ0ZpkeQdbT8IfYXOrmmB6hkUtVDJR0ugXLyELnuCAICpOuROwzIHsoEGR0lC3JDBA4e1T+VzpnRIMP/8KNis5IG8UOIKcio3+PbQHG+qjl44Tcgl X-MS-TrafficTypeDiagnostic: DB7PR01MB4888:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: REkK7AvK0GtcoHSXDTs/ChWQ66LAjKnXzZyzEmPqRwkgHY0rZDX5WUGuEdDTbYU4hvaOi5YFq7YmfD5yzTa39Uy/B3FQRGoZK2uqAkSEgMq2XUYkyuYei9pdjpXtvkdqvNTRFjHuX2lZem2ndq8wa0vnzepGeD2gaP9IB/2rpaDy8YxfikHpvPR40RhVvNiPnsZan2dT5yCni0ZdCNomccDmiFWrKCJwrFwJ/ldREFDJsmkgsmd4sBcMh8ZmUpxMHCgAODcBR3UX2xEJcerskr6dSImsPeNKatqGOUfSIe3yaWtJgR2a88YxGUloE0fIVdVx7gCqkExXp8pxr9B2x3JewkRRHGHSud8vjFzn+9NCdYl4QLyTNqwhEvrngw5kR13cZrSlu1JPQPGFGbWbuDOpxg/wqUMXqpi0FoBstw7Wj++J12yqAknFBfL2TQ9idC59SJgaeH6nTuuowKI8s/4mf+hknxeY6darq3qsbasS5Ws4GpLksvwkvB0BAD346RqcQ4YkF7SGy6+PYgCEJ2aV3pLzTQczLci4B8k3wIWzAt0ArDC5QTUly7+eIgWkwW+QZzvApGe2UJWmjsONIA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MCk8DA/1LJjpO7IZ3ca9Mqsf/uWn73DKIzuSyLcSvmpoljJdgH4mbf1ruSUEkMlXEbhOKiB7PrkybzYau6qMif1Tnl3K8WBI6RjFJvYbwyGxdco0Ke1Zn/DR0bQ/qpDfZN9Fl1pDVJkHNYzKTZ6U+8LYZnYy3biKIFBvOw8CVyWeD7BcR5fB2gpC2JdiAmFDXMnj6+FEpxltSVihaDSipv60B7bn9By9qj8jvi0XivzB+sRgZ8NJR57a77dQOpVfbo6Q4uzRnIIxDCCVREm2Ggr5pZKnK4Dd9eqW6AkET3UXJj7VVwvtJppFA5WgsXaQrKAhvAtHXleq2tPUY1MW87TOUYiUTvdMDT3KW0Yd1hBDp/5mvoSFOQZGb9a9mBhaR0rCz5moGnN9MmLfAxYO3iCjs3mlNKIFPTj+eMSIxTmAgW2koU3ySfF8CW76eqOAEb0AGwlSoQehDaBochHaoaw2/smkGBE5fFGk1wHlA/g2hvDCy4z/6HZhoOVhm9sAOlrEgKK2lpPDHUmlyV3ryfCxBb9OipuCu/kS69W4yAmR5DbqkuNOjpyEO4UbAq2JSq0bR/PpN6VWQhKKh9sXVzpJjnS3KwrKxCtzDbixR3B0dQG9+dUgLnRPdn174OJH9AW1IWARcLFBXvn52shWhtB5+WYkMrFyR6kVJwvYCgWvfzJb9+ND+T/hqFE501o8Iu4FRCJooRTy7NUM+NGdRhnd5qkvf9wKzApQpy53ColCkPbnAsPzGjD7vJ0oGoJAbKK252F6S9fj0KESFIlndJkUXu1yqoNUAerfirt2oLry+tc/MO03mgt97RHqL86Tcy+9G6J6VfdHxYE2zqgW3Bn+o9h7TKNx6QOK6o4DYFyPWYkfKUxEK1kR0JeuZKYhzizw840qXKKy/LGXXgehgVj1qXjWMwLXMMcPKFX0ADSocNZS46F/9bhwLyWZaXh/XdGLrTXl5ZnqTn6M+PgIUzCaGATQD0kEbYMPS8OCN/9wvLwdh9LTzpUEBjB7PtlBoamBewIp3W5tdMhAXjn/Bz1bn7ZGJ+BXypqO909lZ3egRYpfXW3ILTei4uENFY9/4ycUV4xqDkAgRzG3Cq7ytoNwbMuDmC6ZVLtkw3g4xQNv+y+0u//pnzq0ldelJO+KUJINo9OdYYrCUg/YIjdFsc9+4/5crvqzgUeuxbmrBKo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3e2180b-fb0a-421c-1be3-08da0c001799 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 12:32:56.7413 (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: DB7PR01MB4888 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/internal, avfilter/qp_table: Remove unused FF_QSCALE_TYPEs 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: qxSSm7J74Zyc Signed-off-by: Andreas Rheinhardt --- libavcodec/internal.h | 2 -- libavfilter/qp_table.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index badca4c9dd..f9809926b8 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -37,8 +37,6 @@ #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 -#define FF_QSCALE_TYPE_H264 2 -#define FF_QSCALE_TYPE_VP56 3 #define FF_SANE_NB_CHANNELS 512U diff --git a/libavfilter/qp_table.h b/libavfilter/qp_table.h index 4758ee8538..169a7a7fea 100644 --- a/libavfilter/qp_table.h +++ b/libavfilter/qp_table.h @@ -33,16 +33,12 @@ int ff_qp_table_extract(AVFrame *frame, int8_t **table, int *table_w, int *table /** * Normalize the qscale factor - * FIXME the H264 qscale is a log based scale, mpeg1/2 is not, the code below - * cannot be optimal */ static inline int ff_norm_qscale(int qscale, int type) { switch (type) { case FF_QSCALE_TYPE_MPEG1: return qscale; case FF_QSCALE_TYPE_MPEG2: return qscale >> 1; - case FF_QSCALE_TYPE_H264: return qscale >> 2; - case FF_QSCALE_TYPE_VP56: return (63 - qscale + 2) >> 2; } return qscale; } From patchwork Tue Mar 22 12:34:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34887 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp671174uaj; Tue, 22 Mar 2022 05:34:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo7mhvbbPkBnOWoFTeIJcJFM89RzbEQeH2+msXAtU2Q1c0U+o0Bbmc9BIJVpAwCFQY/zKl X-Received: by 2002:a17:907:7845:b0:6cd:f2f4:cf00 with SMTP id lb5-20020a170907784500b006cdf2f4cf00mr25580851ejc.388.1647952491209; Tue, 22 Mar 2022 05:34:51 -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 l26-20020a50d6da000000b004190205c28bsi10387869edj.401.2022.03.22.05.34.50; Tue, 22 Mar 2022 05:34:51 -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=DDoJwvKa; 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 72EA568B022; Tue, 22 Mar 2022 14:34:48 +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-oln040092074023.outbound.protection.outlook.com [40.92.74.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2494368A920 for ; Tue, 22 Mar 2022 14:34:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=loSApYmdmBL/9HDXbrWuyfe7RNEXoekm311XPg1yo30ZKxej5MLGD3sI7uN0GkV/FOxveFknrPTLNKroxs6UmQXdgLJNr39xO20/Dz4VYB3Q9KkrlyHAvWyZign7CRDW1Jakq8tnYFK6MomKhWq0WsaGRq1f2sqobiu2o2zREftlyQtFuGYCDa97Rx8xsaue4EX8ody0+reGbZcIjXcRUOX85VEV6x0QVgKxSdFwwvTnEfZBcpwgjdj+FHHtiby620gq7rYoy7bnGBO4QUR1jdN8cqLttpfUfoNf8q3vuO06Ja/gPj/8/FCGOKEVkeXEylvWRQtLDKBolqRg37s+Cw== 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=33p3B6OUa7YoQqHue1hjABoTkkB4HI4TXMTCit10uKI=; b=OdUfyX2X47fkrRdYp8R4kJm3AYL/tibbujEEunKLeZAjqUUDCYm8EfWgF5uQP7dqoq0u3TbyaFRFKqj4FJroQpD8tL92HE/jypVG+jR0jYzayM7ylpVLZHxGcHE7M7aEwiFxa8ul0arS0MX8lmPYvCywJHCAcB0Vls2NkGO294jire1VgSwyNX7LAnqkZCOqmS/i2ozp7T88fGbRorbFHj8Ldk5bPfxUUy9GK4lTR9oUPshKbCE59Q8de3LLbYwpl8lfJN4tled9mW8gnVZFRGxhZFdjAg/HnIEuDR0+9OZCVjauxovSf1gHiaQL3CCT6DRqvAKY9hbvNUPMOvk9Pg== 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=33p3B6OUa7YoQqHue1hjABoTkkB4HI4TXMTCit10uKI=; b=DDoJwvKa2z52JelM8ZC+YHXRW3qdIemg2p3fsyjVgbuwSiNmWXKF/H9bRO7su+SxbDLhgaRqLKONatQzkxc7iyaP90spT8LzVNZxN9omNqLlLR1nhEHvA3APJAbE1sKLrf3dxVglap+tJhISP5MK4mBFm3BPLH0Lfku/RkwnIxvQM7VqC/TR+uaLULrcha8pM5A5+M4Jr1iShyaJddMHYCpZ5Wt44HLHZDER8y8wkEahYEMWS9LJOTHvNhYj7rq8V8c6awt/4m9lGW8652Im7AJ0LFHFxxvmNoSUQF0mzQi/LgvVv/3HkYTbChdquLIgjpl+d6Quz5LbQDjCw3qLFA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by DB7PR01MB4888.eurprd01.prod.exchangelabs.com (2603:10a6:10:28::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.16; Tue, 22 Mar 2022 12:34:40 +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.022; Tue, 22 Mar 2022 12:34:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:34:29 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [zyugzQRFg2wJtdycTrz2IBkr2Lbsfh5U] X-ClientProxiedBy: AM7PR02CA0022.eurprd02.prod.outlook.com (2603:10a6:20b:100::32) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123433.368717-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc997e6a-0c18-48a5-634d-08da0c00559f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTYoa8NShfDu+TcA5Kmc3q1VEj/cuSyGtshO/pY/qttIwQ313bbk8IOlgFmoaZRr7H/OfiM6Rotordxd3lPaJF1yof1hdsMVpfo3fCV5/YvsbSE10ffeqOc2fGq/Rv1ZhPmeMqnS8m8FpLxqlb0yo+9ogDG6Kq+Jpn5WTFRdCElgexPR5/t/t8Q/6m4bJuSsZf3ceek9Z21n5t627N9x+hUw7SMPIlqzeN27a5vXbhIzTkqtiWPKyguW1VrqBThz+4OmXCHoOTqf2a4eUuYyPgMN4ydsDZ/P54xXHQxZYfakl03o0lyDBx+W3sMft13+/vV8b42cGxI9DFJ3DMGDocz0DbRQJPieZ16wV2iB2ERGHh1mZKgIDvTvk5a58ViONJu/CLjR2cMQvAP7v/Q9NH54z907GcNodPaJ8th4qaDc7MsGCwrZ+bMxFuVl902D0T/tgul7WMhaK0KGPsTVkwcs4yDjgCGxPhxASsydzOeizJyS0b4EYJFDO8+pTkkoJLkUa/FGxuRVQXTBoJ9jkGNuM9omdl8UxmQldbeWS/qwJCZkks/yMcGBQvwM/8TVxTt7eB7qK43NHl3xSaHRHCeW/w42aiGJIAyCk/Kf3cxartYtiVNyc0ZTfdVlXKxY0MHj0YrCPNsaKa3X5qYd4s8BuRFxZI/HcPklPfcbFC99ZrxMEpIfUvcdc4terAFhIW2+tVeZUdxuurcDfrtjnMsvHTuQm1I0rIqJDPi1nAo9a2zx2sKGjrh1xApf0UlxG0= X-MS-TrafficTypeDiagnostic: DB7PR01MB4888:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nlMbYzlzFcM5ZHMwlcppE/JF/v3tJZY+UuB/Z1sF0dqk+6rOTSsQ7W0TyVZtdaKyfG3Ws7Tq0mbH4OvZ2Yv+r1UGSaItYnPTHfKcNhnOiOqdtBfxkTJijwx153f4q+Rzqk792C63W1LbTcQJY3nf/aArA13c4grumn1UNOnPy6VmEJ6YZh4V8bhq775vdERKRSeQJvGByBTaJrtEQykpEHToZSzsXx2p+JqPdsTFwnvYUuv1L+TyzjMDpncgdoxsrnAklxqVqQPXShW9RNZ5KQ4gy5PLl8q1hbDUIK/AKeXDj9p/PNnPbct7s+DzGOY9O8/57+RrmAerQfS4RSOAZcCoatVCR0N8scPqsb7GhJ1tbw1NDLZ5SvUV9TM39XL2YSjD8vb2l4zsl4+qhHbp1s25rbS8GNhHNgZTvAtzUnYXGDkhyPW+oWtdMsZW+uUmVWGAYDjzNcpG6z60TbU0h5D4ZU47bEZHf5FvJhS/0cWuy61sQUNdpqBYSN3d6QDkNLNaSDsjFKi1nzau+syrUa6CinC0VGQhFPLyapHg4Ex90W6XMXaUgndcihoX82iR4OVIFrcLRWP+BVVtSbG3fQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RvNJang7cXNv0LD+3jcUMj+GkxqNnfDB4xkq9kf/w6nWxz4FgXP0AO6UPnrStmXeOnwqEh5Z2+UVtb3w3EArtb3QMhumL6qy0L7h+/FIpQxpA4Q7jYraJtuOmbpW7jxeOvCcuCp9lFFrCNOVwaa6di+YWZ+dZ+hWQ6r8V+PWyP060GjeOljshnpK8j6aqz6pO7LJLZxVw/ujfXYOK4Cu116VRAutJGddEPunrMAhrIIh/F0DbWZff7fmdPMOTKENP67PpZfSG+nnj2DC6f2kXPyC+c9jgemwrgcjQxWOeN/zVmIjuC7nDMHszMOM4rNinFUuUJyGeo9YLVhF4fnw6V+UAldLvXUOAHfs4nX2sysGA6BUNNrOzqf5/VZMesA+67R2FutOIrBWDUyTVYsdF/vKVVJdZf/v936P9rWxy71zsq9NwspaQmb0t8WYwOS499/yW8XiE1UZmVCR0y+Va1nPtB+jFcn92xPzFkTQ43SgCG7O/A9cuJIB3ASqk5/afHAit+Wz5KZocUjXI0Mg8Vjcqu8Oas4kfLcj+6qDA5SoJdSRDEzz1Uh49wK/BGUCeDKYevsrxHkRa0IqhKCFlWYMHuVg/yBSYRQqxjyLsLl0yFahRHQVkfZ1/amP2Yfh8G6ItFHR+q4A+A/kjo6BoCpzsSpIo0Q7AzeiFykGLWjRk9mtLJuCYPcDIpM2ihqxDvFkQi35PuDjgb0szSJtDXpxWixtxeEEbMm5BR/BKt1RN9qsIsaK3GTc9sZAOrICWolWbAtSL02Y44eWsb2Wd56KeY16dsK9vYtYRHJqtM+cp1GHQdJtxcoRnUFkTUAQZEiMgObztUaqObK5LoAcMWj3nqDMvXtfQaYvKZC8MVaUuzy/MymXecXV5DCPQa97lv5XHVvTZ3cU4WuaZFtrzjn68m8rGOKw9zZ4n+MPSjC3OwAhmfm3PPffdKKZ1hSkighLA9X2rMm7x6l5jKDGCAJTdnb1BIRmrOiZE5IcYj+d8TXPUyh8nphtyCNDjBfJ/zfgcdA8aJaN99o2LOm0YtJhshhPZVN2qjYH6B3JD1rRtm75nPJWjGtcENfCtt8/KnA2pcWpzD6pD0I+DoaDe3kYa8L3WOxzUbz+aJNIFSN1V8KGQPogdtwmJfYQlgf75HC6KU52k7pLcbHhCod1vfO5nLU2DLo1rvRhuVdhpXs= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc997e6a-0c18-48a5-634d-08da0c00559f X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 12:34:40.5513 (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: DB7PR01MB4888 Subject: [FFmpeg-devel] [PATCH 2/6] avfilter/qp_table: Stop using FF_QSCALE_TYPE_* 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: qoNMbu8fm7o3 All FF_QSCALE_TYPE values used by libavfilter originate from libavfilter (namely from ff_qp_table_extract()); no value is exchanged between libavcodec and libavutil. The values that are exchanged (and used in libavfilter) are of type enum AVVideoEncParamsType. Therefore this patch stops using said FF_QSCALE_TYPE_* in libavfilter and uses enum AVVideoEncParamsType directly. Signed-off-by: Andreas Rheinhardt --- libavfilter/qp_table.c | 7 ++----- libavfilter/qp_table.h | 11 ++++++----- libavfilter/vf_codecview.c | 3 ++- libavfilter/vf_fspp.h | 3 ++- libavfilter/vf_pp7.h | 3 ++- libavfilter/vf_spp.h | 3 ++- libavfilter/vf_uspp.c | 3 ++- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/libavfilter/qp_table.c b/libavfilter/qp_table.c index 33812b708d..8137dc019f 100644 --- a/libavfilter/qp_table.c +++ b/libavfilter/qp_table.c @@ -18,9 +18,6 @@ #include -// for FF_QSCALE_TYPE_* -#include "libavcodec/internal.h" - #include "libavutil/frame.h" #include "libavutil/mem.h" #include "libavutil/video_enc_params.h" @@ -28,7 +25,7 @@ #include "qp_table.h" int ff_qp_table_extract(AVFrame *frame, int8_t **table, int *table_w, int *table_h, - int *qscale_type) + enum AVVideoEncParamsType *qscale_type) { AVFrameSideData *sd; AVVideoEncParams *par; @@ -55,7 +52,7 @@ int ff_qp_table_extract(AVFrame *frame, int8_t **table, int *table_w, int *table if (table_h) *table_h = mb_h; if (qscale_type) - *qscale_type = FF_QSCALE_TYPE_MPEG2; + *qscale_type = par->type; if (par->nb_blocks == 0) { memset(*table, par->qp, nb_mb); diff --git a/libavfilter/qp_table.h b/libavfilter/qp_table.h index 169a7a7fea..4407bacb0e 100644 --- a/libavfilter/qp_table.h +++ b/libavfilter/qp_table.h @@ -22,23 +22,24 @@ #include #include "libavutil/frame.h" -#include "libavcodec/internal.h" +#include "libavutil/video_enc_params.h" /** * Extract a libpostproc-compatible QP table - an 8-bit QP value per 16x16 * macroblock, stored in raster order - from AVVideoEncParams side data. */ int ff_qp_table_extract(AVFrame *frame, int8_t **table, int *table_w, int *table_h, - int *qscale_type); + enum AVVideoEncParamsType *qscale_type); /** * Normalize the qscale factor + * FIXME Add support for other values of enum AVVideoEncParamsType + * besides AV_VIDEO_ENC_PARAMS_MPEG2. */ -static inline int ff_norm_qscale(int qscale, int type) +static inline int ff_norm_qscale(int qscale, enum AVVideoEncParamsType type) { switch (type) { - case FF_QSCALE_TYPE_MPEG1: return qscale; - case FF_QSCALE_TYPE_MPEG2: return qscale >> 1; + case AV_VIDEO_ENC_PARAMS_MPEG2: return qscale >> 1; } return qscale; } diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index aac038edef..cddb3e5368 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -227,7 +227,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVFilterLink *outlink = ctx->outputs[0]; if (s->qp) { - int qstride, qp_type, ret; + enum AVVideoEncParamsType qp_type; + int qstride, ret; int8_t *qp_table; ret = ff_qp_table_extract(frame, &qp_table, &qstride, NULL, &qp_type); diff --git a/libavfilter/vf_fspp.h b/libavfilter/vf_fspp.h index 6623af450c..ee7de3ffef 100644 --- a/libavfilter/vf_fspp.h +++ b/libavfilter/vf_fspp.h @@ -23,6 +23,7 @@ #ifndef AVFILTER_FSPP_H #define AVFILTER_FSPP_H +#include "libavutil/video_enc_params.h" #include "avfilter.h" #define BLOCKSZ 12 @@ -61,7 +62,7 @@ typedef struct FSPPContext { int vsub; int temp_stride; int qp; - int qscale_type; + enum AVVideoEncParamsType qscale_type; int prev_q; uint8_t *src; int16_t *temp; diff --git a/libavfilter/vf_pp7.h b/libavfilter/vf_pp7.h index 9aa8d732c1..b7cbb020bb 100644 --- a/libavfilter/vf_pp7.h +++ b/libavfilter/vf_pp7.h @@ -22,6 +22,7 @@ #ifndef AVFILTER_PP7_H #define AVFILTER_PP7_H +#include "libavutil/video_enc_params.h" #include "avfilter.h" typedef struct PP7Context { @@ -30,7 +31,7 @@ typedef struct PP7Context { int qp; int mode; - int qscale_type; + enum AVVideoEncParamsType qscale_type; int hsub; int vsub; int temp_stride; diff --git a/libavfilter/vf_spp.h b/libavfilter/vf_spp.h index 76c0c34ab2..0a8b2b512e 100644 --- a/libavfilter/vf_spp.h +++ b/libavfilter/vf_spp.h @@ -22,6 +22,7 @@ #ifndef AVFILTER_SPP_H #define AVFILTER_SPP_H +#include "libavutil/video_enc_params.h" #include "libavcodec/avdct.h" #include "avfilter.h" @@ -33,7 +34,7 @@ typedef struct SPPContext { int log2_count; int qp; int mode; - int qscale_type; + enum AVVideoEncParamsType qscale_type; int temp_linesize; uint8_t *src; uint16_t *temp; diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index c61a2a0705..051de00771 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -32,6 +32,7 @@ #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavutil/video_enc_params.h" #include "libavcodec/avcodec.h" #include "internal.h" #include "qp_table.h" @@ -45,7 +46,7 @@ typedef struct USPPContext { int log2_count; int hsub, vsub; int qp; - int qscale_type; + enum AVVideoEncParamsType qscale_type; int temp_stride[3]; uint8_t *src[3]; uint16_t *temp[3]; From patchwork Tue Mar 22 12:34:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34888 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp671193uaj; Tue, 22 Mar 2022 05:35:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjzelj92c/sjdgKhiZe9HTGA9clvVyOjyc1Qzp/mi4dUD/FdQCSw0j9fODBNpC0PPEeKAW X-Received: by 2002:a17:906:9c82:b0:6df:baa2:9f75 with SMTP id fj2-20020a1709069c8200b006dfbaa29f75mr18619516ejc.762.1647952500349; Tue, 22 Mar 2022 05:35:00 -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 w9-20020a50c449000000b00418c2b5bd70si12724802edf.82.2022.03.22.05.34.59; Tue, 22 Mar 2022 05:35:00 -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="Rkn/+6Xq"; 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 7455568B19F; Tue, 22 Mar 2022 14:34:53 +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-oln040092074023.outbound.protection.outlook.com [40.92.74.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4427E68A351 for ; Tue, 22 Mar 2022 14:34:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TuuYj1f+e/y+VdbOuS+Z6vxgZZuU5mnTDL69sCd7y03yLWH58oSSkviiQtAlNItpk5Aauwybo/7Y4WN8nWJUQC1EO7WKIkWRQXWrS0gPgx94lLe8Zo5e2N0CqDcW2fFzh5WBt34eDtNWcFDOH5aBmslSBV3/7HqZwNHm+QnaDQIkCN7OOZ4Ig4WG5F/yhCHooicdf+NhKVn3KCWltAXD7TmqrPBh0pNgMdBQDSJTrcZmVc6eabHY1nPEzYCYf3fAOJ0R830MDVaKwuDE1LTvwAt1aDaESds++KhjmrbvhYeG376E6C565baRJdY4jqDhylb7XRAAJe2btEaA48gmrw== 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=9FniY9Cucp2k/a5KC+vwPOnu0EfKgUtmx8+PclbHSlI=; b=kTEIKhGUM+PyktI/nquH29z/OmQmZDVeiUTiRbMnyWxhBcop8QkwJ81sswO/mw1l2ppYg0tyZt0E45c+Qig1A4zPqCb77AVbB5WU4cUfxzfz6ZA3QvkmF/zB6G+zVjHrjvm+ZWPVfbDMowQc0NWYneysl/zGesNoQcsZuTtapLEhQSpI5/3FBEKEPnTwy3gVsovwZHnp2ZP+YJtw7P4NIJHWCwFKqidLea+uQ3Nb1GMrVDvikXE1HLELcCoQ6TySrzIXT14ctxEXEAOCozoDZEWw65NtQC684/4RYkQEwwqjBuEHw51x6BQ01M5TyPzl9Jnvp9dB2TUX+lLoT+Pcxg== 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=9FniY9Cucp2k/a5KC+vwPOnu0EfKgUtmx8+PclbHSlI=; b=Rkn/+6XqHPqSO7Q+o1LRLwFehtbO0KhfWYMnf0PFfkq1sEgpecjScElWQX8tAZH1ju0eXrFdlVPuncHMfNPcINtpVMgBxm+baPCMQG0zJXg1aVODydQOguW18DzpdTpV7heipoVsh6sJfGofq/GEzpp1CM+dkTTMSO/j2UWHxjk00m7WGbLbZbbGpO+KsW/eOrIk8CoD+vJU+8v6KxrUb4bfsb8m7/Yygxcxgi+y0QyocUc0ohUykVdSIdxkkkXY2dN6YTuNANgtGrf1/VuTEkS/6eW4avdBK5e7d1oQPE73hvIfVkJFzy5ytk6G3KcbYPOb0paa8LdIHu5Rf+43FA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by DB7PR01MB4888.eurprd01.prod.exchangelabs.com (2603:10a6:10:28::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.16; Tue, 22 Mar 2022 12:34:44 +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.022; Tue, 22 Mar 2022 12:34:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:34:30 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220322123433.368717-1-andreas.rheinhardt@outlook.com> References: <20220322123433.368717-1-andreas.rheinhardt@outlook.com> X-TMN: [9/Zt1rROBbliZxGPKwBf4Mo9dla28TlO] X-ClientProxiedBy: AM7PR02CA0022.eurprd02.prod.outlook.com (2603:10a6:20b:100::32) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123433.368717-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59cf7c03-38c6-41a4-08f3-08da0c0057fc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUXiI7VfCKpkhTERZyvrrRoDna7ea78sGEWgHooOCpa9HyxSE3FV2ndofKHvf8JevD/manq1aPB1Zu4GuQB7XtZKSn1iIiDRV8jC0E50TlOF6IuJFDSL36VxOwIrj2ana4VzHYXy6pJe28zLVqVWsJApUEIj1urulsvkJsDxzhGgJkJRt7sFwZc0GJyNPxH8H4enkrK5HJz9FlxlYq+TtvKixJ4ZS4LSrE268C5g7t3LPxHz19otxzQzqT8G2xMzLspa8vwiirxu09bbi0KAzce9sVYaLpDkDY5I5k38yNtIcfBXwNlJedHTGA5UAAMdZttotovupUcMEvUfSOQJAnRZepudD8kgbghYHMBQAF5rouTllpj6w3UEQ6XgmxWG1JrGS+VAhH/VR4HLDnGD64z7qbTyeP89P46sHyjFClPtPB7YRI1vSYKNA2oEPn139lvq6k3wDwXkHGKt5DVhCFD3JWLcqqMlsNfCOKg3wzNzYh4+52nLfHY0yV/zOcDTozCtrd+csA7wWjX11w4o+rcBBL0j0aNr+3pSS8tzRx6Mjs4bPRVbMFy5ysunvyQasGI4Y2aRbtq078jal1rGpmLqL0reEq16v81+xd4LmWedHgAMzd8a2ZvaBp4Ic3qJkJJlmsPZ6lb+fAt2sCGtJjFQT0UFaa6XUEpY50HViO7gZDD9LKSnICOKmuGkMRkAIAOhkFX9Z0RgjaYdJscXeEGJx7D9jONxpc= X-MS-TrafficTypeDiagnostic: DB7PR01MB4888:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FkSYufRR1yvPxm27a/oQLy3sTH0toI2Oak3J2dlSSMEmVt6BNn6tim4+BGAWPvO1N7n48VWCsj0VZ8CBsg/5D7qFP/V4u7NSAIGUP5ZtXlhIE5MQiTYCY4kFfb68ufL5aq3c2P/VU7Kxq2HZhmZvZsLQoCWc6y5+IxGChLhFx4pPO4VqFo3pmENXT34gKxNkdZmDkMbgxUZtlowAgK0EtLcIvL8E53FBAju8TK+1V9FYGVQZwptFC2PCtdbknjKj0L01k4yGWyXYO1Kf4XsD3ojbXVVZYG5WbdD4Hdg8m2nTvnG7FI3ezZ6KMYRRW7tqFgrMUO/2ShARezewf4fyFJryiVB7EDqhrZZkE1Q6hsrzS+rKd+LjRtbjNiqQZ8lEGV/2eE5b5JrS61fkgUzQTYXA90SG0oXS/31P6EcL78S0XD99SCwQYqh5f9SDpEgotl1TGosltFFagPFk8AQjtLo5wX5hWeJxodyLRXFs2SzGK+Mrf7SsZ8myUgMizI2xgNesvz6xj3J6Luer2nAn05NDSgGDf8nPuk3oH5bZ5QxQR0e2YF9KsH0OR8z+fAbHYEsSdR/Cwdo2GrrntQM+gw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SPE9QELv37GwZjcRLH51Otznz0PmJK6CxT69fsP6eqblZfq02TLBxvlUlbboX9PjqhKdvM9fcWTbjita82o3ahwqyUa/8kUDxe6vqvOPgu3RFaiYgDiIf/QT6cvwseoOgCJ55F5aInNLIFxe/yh4gyvTZWXw1WEVp6XN7+CUxnQKCyVlZV0k4bZHcAHhu7hn3zRFWtIgkKSe5lCFvIRRDcII3pfvJD7QTm7LlgLcsm/WuQhcS9hkKAxgLHS78becyBfKKTkPEzNQYQkvLxYejYmctg8vbZlSg3qVk2OTVNf1v8sT10I2JKeC0gJz/fXkBCKEZQf13xz3gtAG47q5AQ2yJYrpEd5haC3WVq5rPEjEjCZzBfmjIN4X+uUPD3GvZPH7LCSjtvnuUSX72/nlIoEJ6544NpHl1Co1DB5PXc00RRh/kuQjA/qXouwg/3WOMoS68QXowm6NNQIm7ChOdlY9P8a0tTdCzDtBlTOQDaiEZQNtguxnxIRhqt6aSGjAEZhViNm3Rf0gWk868EhcApL2IWJcAQzwFTn3cdoPSD0E0PnDBdQQ808sQJLnXjOgF2+s6Idu+4D8Plp55LCTacwcyYpbuiJ1uA8xCu5LNsdctMBD8fbN5ZKYVpQBknRyer2niw/+OcdXlgGPn9CcPyAa47Kfp6K7ELNl8sTmrU6wM3FvufrCVK2v2Rs8WbPccJ/c875imjs8hdmtmkHRJi+PvUPfv5iUQA2+GulFI2ZMbS4JcYVrKVhhFWy/EOTMJcH1zc2ApvcQnBtNon1jI7fzcv9bnChUqY0i1hYBT2/+EZXmOfhlh4mSAWTPISz349Au3DZivzZKgLyzN2kr4JMkd+4FA1yknoplPe+lM4AH4r5KF6mLYseEfMW6nDImWx5ZgB/Vj8GxodVaBDrrIlCaVEA61zNa5GN04XyHM7uJGt/Wql2mkKAn2W49KjpC/d41iwH5syLmeLxdEYGJ6SFgH1axM4Wk+i/5xTLZwi6NNoDmtKai443bQjZLlfc6KFvGBU7zrE2GROplUD+HEF/5PqkjnZ0/CSnXgC75vUqbx1NNKQXTL2gVnx9Slymf8K8i1svuNzthA110oQ5rZ0+AHtoTN/coEv7E5l78yTATejhZnvRrIerP3ky1wSy4ytYp1ebdZw8RbRZYDqx/gXCZYwyQ32aasdlQw/hXO3w= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59cf7c03-38c6-41a4-08f3-08da0c0057fc X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 12:34:44.4983 (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: DB7PR01MB4888 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/internal: Move FF_QSCALE_TYPE_* to mpegvideodec.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: QHIX0+XhFSwl These values are only used by mpegvideo-based decoders. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.c | 4 ++-- libavcodec/internal.h | 3 --- libavcodec/mpeg12dec.c | 4 ++-- libavcodec/mpegvideo_dec.c | 2 +- libavcodec/mpegvideodec.h | 3 +++ libavcodec/rv10.c | 4 ++-- libavcodec/rv34.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 886fbee8c8..965a7d30c4 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -695,12 +695,12 @@ frame_end: if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); } else if (s->last_picture_ptr) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); } if (s->last_picture_ptr || s->low_delay) { diff --git a/libavcodec/internal.h b/libavcodec/internal.h index f9809926b8..f9d08fcb60 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -35,9 +35,6 @@ #include "bsf.h" #include "config.h" -#define FF_QSCALE_TYPE_MPEG1 0 -#define FF_QSCALE_TYPE_MPEG2 1 - #define FF_SANE_NB_CHANNELS 512U #if HAVE_SIMD_ALIGN_64 diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 6b6cadeb05..887b8036f8 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2040,7 +2040,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) if (ret < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG2); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG2); } else { /* latency of 1 frame for I- and P-frames */ if (s->last_picture_ptr) { @@ -2048,7 +2048,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) if (ret < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG2); + ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG2); } } diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 28e4e5b781..7caaf0596d 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -513,7 +513,7 @@ void ff_print_debug_info(MpegEncContext *s, Picture *p, AVFrame *pict) int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type) { AVVideoEncParams *par; - int mult = (qp_type == FF_QSCALE_TYPE_MPEG1) ? 2 : 1; + int mult = (qp_type == FF_MPV_QSCALE_TYPE_MPEG1) ? 2 : 1; unsigned int nb_mb = p->alloc_mb_height * p->alloc_mb_width; if (!(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS)) diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h index 0cda0af733..1af8ebac36 100644 --- a/libavcodec/mpegvideodec.h +++ b/libavcodec/mpegvideodec.h @@ -35,6 +35,9 @@ #include "mpegvideo.h" #include "mpegvideodata.h" +#define FF_MPV_QSCALE_TYPE_MPEG1 0 +#define FF_MPV_QSCALE_TYPE_MPEG2 1 + /** * Initialize the given MpegEncContext for decoding. * the changed fields will not depend upon diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index bd707a391b..23d0ea8516 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -663,12 +663,12 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); } else if (s->last_picture_ptr) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict,s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict,s->last_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); } if (s->last_picture_ptr || s->low_delay) { diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 1fb17ddb90..fb5b19c913 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1573,13 +1573,13 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict) if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); got_picture = 1; } else if (s->last_picture_ptr) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); - ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1); + ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_MPV_QSCALE_TYPE_MPEG1); got_picture = 1; } From patchwork Tue Mar 22 12:35:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34889 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp671235uaj; Tue, 22 Mar 2022 05:35:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxawJDfb9e9+xalRzO4tN7hXGKYpQhdkoffRi6L0SLespWeB3LX/zRwYx6Hbmt9hxGQ8R4z X-Received: by 2002:a17:906:9c83:b0:6df:839a:a6d0 with SMTP id fj3-20020a1709069c8300b006df839aa6d0mr25349334ejc.419.1647952525740; Tue, 22 Mar 2022 05:35:25 -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 nb41-20020a1709071ca900b006df885aadadsi10854280ejc.109.2022.03.22.05.35.25; Tue, 22 Mar 2022 05:35:25 -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=gLZlZgir; 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 9813368B1C6; Tue, 22 Mar 2022 14:35:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073015.outbound.protection.outlook.com [40.92.73.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14EBC68B1B7 for ; Tue, 22 Mar 2022 14:35:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fdQvdf5xC4uI6MHzE008nC8gZsfIf5YV2aYpJmJ/zx2zWDg+ugC/SXGVkE1hmxcSwjAAGdDVYusLnsb0sSb9hITeUKLCW+W71s3SJupxvQciA2y1LaNADBARyFj/fwmBeRgzjxzUl52sS4BxSUdzcPIRf/xwu71B5IASGrut6s1brK90l3yOjHpIUXHuQIefrZrpRAeoi9k2dCE8i8OzFOgVlQNoMfy6XdMJpxdebPo0yKjFn9UUbkouw+w5eRn4Im0zMA/kI1G5HFcwyICadZXXwglEc9UecUhk2+QyiStHhttBM7QyZ6irJ++ImufjSGmKERognVVhimZh6l8N/Q== 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=edkZ31ujJA9mHjA8/N19WD7a4aRAMnlvt+/xUBroz2E=; b=A0mqLnHrq9hCqCWNTv1qXpbjRHcKJ90SUOvYWBbYFvDrnO7nvOD2NvW8jF8ZklLnkhgBYKs3/WDec40NZN36Nm+GvaMCBgOharVo8KfMQ4TwX2BnidrXthKQ6HiLkBd5iwDmo5qWkVMuE3PalMBLVGUT+4t/Q6E9AfOsDcAkfw2Uo32osrfIGOYawxMi9P/sW3OnnA11bYL0CAqf+XjFv6TbhjqR8wlXzmLs6RzCbTVroALR96XTkmphLIHckQLjwzCICTz629cYex2WMnriZe6Hs2Azjja80aojlTMy8UA2A+xqb6QTuoe/qIkUDKzR6zn1qIJX7VhhEKoCoXxfjA== 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=edkZ31ujJA9mHjA8/N19WD7a4aRAMnlvt+/xUBroz2E=; b=gLZlZgirwV4mzxQ+66byGiUG1sR04UTgRxA1BU+XPhGLv2MKWt+f+t8tKshRLWJld/ZS66fXyr7cKSF7UbjBEyuKuwvr3zU0GiihI9z5wO97MmIvTx2WrBGi9nfBMxqey8E06CpZCnm5NkeF0YHbeKlbig+Zz5dMXwB4mxIY51YAKIyDN1NJFVQ/q08lR03uVgzjSa98McGDvVr2vNu5zazNAGszS6nYq/Qe+i/EVTx7iVhG514cYfRfwq3GqVYVQetBWUm8fF/vJAXoE0dyn/NI9qDDH/FWcOjtPb813mHeUO4WW0zn0FzKnPrbsShHrf6ujPdxShasn+3zZ4qrVQ== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by VI1PR01MB4717.eurprd01.prod.exchangelabs.com (2603:10a6:803:a4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.18; Tue, 22 Mar 2022 12:35:19 +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.022; Tue, 22 Mar 2022 12:35:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:35:09 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [M6ko+YojQ73r/y7h37EMVM/Yu3i8tFCP] X-ClientProxiedBy: AM6PR10CA0068.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::45) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123511.368793-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f0ba3122-d491-4ea4-87f2-08da0c006c6a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTYoa8NShfDu+TcA5Kmc3q1NQxp2NoftIddgi3Y+AZgo1xPyggz5GD55MLq7L4tg8pNf1aO4IhG57S20mrejYmWlcenIsq352SLB5/xug20Bn77zHsikjaeO61YzpLFWJqf4wVUK08m7ULm6XLXsK6/+LbQ6sbO5I+ut/E/pOMG4FpXrw1jQ6gA8ZsxiqMZRKbf78JAxvkvAK5gtk3WyWW3Zrnn0ocvZozYO3shcSidXu8ASjFWqE0Tz/Eg2f+fLC+haRDQkBNi7WvaVvlIzk+WOetIK+dQ3Voi00hnUqxyXf5qkZo3zPd/nPW36yrDS37oPPLPN2ypxfIgUgShuuGqtHV4JhT3OSdODQP+uUkigT3LkkNfhknCLCAprW/kj9c49bD472gT9QttSappQMogoQ6lwRW6xPkv3SVQBlQ1BOoZYluSu2bnUYnF45ZRWwCStqkrKbyqXJXQ4XReHJDDDVEOG2utiVBN4S1osxP2Rqv0sIa+no3YhClUROiWUTwQ+rc+tLAp1SFXPyk/dfaWQMwX3VmHA23f9ZyYuopuO4TzW3yFLJih9ROGqWAJkhoa1PmU7QIO1JAr5rJoSoppTsy4n6xVrTOj+yfVdvCUFsF2MU9rjUq/jy6WWx73cVP2s1jkdgyNdnUhA7kDLjqrAbYJl113U4s7IpLtYiLPPfCyFbfa+i4t2R9Y7Tmx/EBTb2syMEMlEsAuBqyVav8/vINMA+B3xd6GtnK7FIKhvgbpooLkNnROlzpj4yOEF/g= X-MS-TrafficTypeDiagnostic: VI1PR01MB4717:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2h80sJnyFdVqQ7bmOr5iNBSD4aivBEmtuNlVOi1APhgyp2xQhlnEPplG9adnbT0T3L+6GoRgEWTlJql9DghEYYOjNgLuIQ2eb12bxoKORzP7/50LbrjYTG4geeUCbleUMi5K3ONUyHVPGSvrIwRPO8FFpt0YtRWwhZT9982t8RC9kxG9ohh5+jIBQ6MIAheVCKR4v+MQLtISrY11CM4N1xrzRdbjkkYxSX/uOUZDFjyOxP1K+est2tCNZJztgqIF1NSZ+HLBFdBe0veIK0yqWfOY8AzIFE7eNxYjvZCw+TlXvxSnAAH6qxfL9Iid5PFLE/qJ7OQKc3pvWLk1uMk6Kz4ejAlxYKVrke4xaCnwHRsmr3BCDJrTVqkiBlga95S6Sr6Ifh3AVnFzlTJnBi9m8R1VN5WoxfiMV8sk1U31gupZGm6wpnCifCE5fTtkKenGhXXC64JKKWcAENVvQiQu7ZgTQAT40EFW3Q30XK3xGKVJRJaqHpONR0yPIKBO9MGR9hXUfXk37/2hMheUtue8zEulQTU+HCnnowNETK0HhVPRqlvmn++/qqLw1IBycytOLpK0gfvtck0dOA2SMccqRg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JYGkmCax0BiDmX0ozxiLLAzEQCXQ2yPO8BhTmm9HWPkxF1Rbb/pV/BtQI8YYVgUXK/foX6Z2jH9tanYhBD1vBqBWZ5wsFQDzTFa0dVESThcNeSUmvVH1rSgLvbk4/8Xzo22t9KQFpjI2UyvAj5NZNxhlVM6rsompo3h4Ridx6KRmqXxViN+guYtMHGb2GFyUsK/c5nqzgQbLcoXPMm9DJCyjP5sr8v/1jBiqOqs8MGydjccZyEYZc6Tk+xivWooam57klV9/g/QQjS1VfPoFfj+jnoAA607DaDTUjZbGDu6WnMm6tpDwAPMXPW9dRqxGkFQTdyLOCxOkFxbxr0etIc91NVhWPkJ2FvrU1kGx4NUP7Ji3mtaYw+icl5nbZ7zUBcyq7JXGW5pIzgZQh6Rc1wawu94fwANzoObBbmiV1KQHhRCurEYwq7GSGgX56mv72FNM14ETWWiSHTFn/f/MzzUTFPBP4Mj/CO33Kain3IOb2wFwV4DO0mONrbO9LJ9wWSwOMzVBGU4Lod6ZiS7K11SWqx9V1ir2IE86h3rW3EQEFD5DZ9L9uv4IQUg0dGpn4JdHZG77RcLkMPkEN5wshUV6fBhswiTE5W/CB6DFQtkvX0v195fihxWE8V0m2jOfpOQwJzktpWfy1CHZ+g8MUuKwPz/lnQNQoKR0ja+hMLIrzDV3MgTH0sreStVo19fb6yMhU/FsXn6IeF2GaiBZlmfbCpZ/7OYjpnV+l9/HjLH1t3s2O7OIaMwdg8JGJa8tObHk0hMeU8KrEipUZS3D5d3olzpTr5CoyzrLQHaeiAzf8ZBiL+Y9aGOS9VISu1IIktpAJ++GodgN3V/PkXatAh+XAWH42f4/3+pVGAIhK0FTQcPP1N4BgJXE8lanK39hQO0o6ZKCYtUSuuh+bFVGX0fOtEAXtos3cCBDQmsBRwAPe+SyRHPYplAoziGWScR7gi8f9wkhx9cmcQ72l5w0NuUjgAkUDDm4ALCqrovLywt3Bl3Yfiwf0a5nabxIiqf9+ho7SYgAiei3xLI2LU8U/fO2SGiMG/8fRLmZMKRnZKSfvagRSPBeylgy+TfdsPhErWA8LemnmnXZFYiryep1WKdI6GeKG1kTmdb+XOh0RiKZbTunMh5uctoM69zh6dQAEM6ICDHHSEgELmvWsWPiFuQkl1HuPslmCbWC9+8SaSU= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0ba3122-d491-4ea4-87f2-08da0c006c6a X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 12:35:18.6675 (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: VI1PR01MB4717 Subject: [FFmpeg-devel] [PATCH 4/6] avfilter/vf_vpp_qsv: Remove unnecessary lavc and lavf headers 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: X+YUdH/cVYF/ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vpp_qsv.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 5c96703fd3..cfe343822b 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -34,8 +34,6 @@ #include "internal.h" #include "avfilter.h" #include "filters.h" -#include "libavcodec/avcodec.h" -#include "libavformat/avformat.h" #include "qsvvpp.h" #include "transpose.h" From patchwork Tue Mar 22 12:35:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34890 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp671256uaj; Tue, 22 Mar 2022 05:35:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztf1THyUWleOgY1T2A9/KLGWo8Luw6POl8P+yQ01LalWH36F1k0+9V6mPhVqCXXow3CRah X-Received: by 2002:a17:906:a0ce:b0:6d1:cb30:3b3b with SMTP id bh14-20020a170906a0ce00b006d1cb303b3bmr25217182ejb.582.1647952535148; Tue, 22 Mar 2022 05:35:35 -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 21-20020a170906009500b006df76385f2asi10404587ejc.970.2022.03.22.05.35.34; Tue, 22 Mar 2022 05:35:35 -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=jvznYOwj; 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 AAF9A68B1CB; Tue, 22 Mar 2022 14:35:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073015.outbound.protection.outlook.com [40.92.73.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56DA068B1B7 for ; Tue, 22 Mar 2022 14:35:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WWsHEtSd1DIfBneekz2TCmqoVLwItJmQIQg8HZjgYl5fVi7QnvaLybgaaJhlUhk0V08gAnAcTroEHhKpPsJOVda5J6wfd8ednRVawwSJnxFdyVVGWVW5O/O56q+0/1L2I4UMzux7yPi2OqgHH/yFIe6Z1Ui/Z1i3C8x+9S6DS6mMGADuSt691KyIsF0ovNzRJRZwth2CCtWXydnCvL0AbDedivP8a41hZZU1uAAph6ugGheHZuwwuMAO/Rt8JmtC8aXStjOs74XhVqdpKHlW9EQ4QcP/rnTY7uvr6wtfC7xopJRZ66KR/lCLZArq2DC/a+drQeoYK0QkUIpZM+IkvA== 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=nDPSSwAIC67wcFoDaULuestfB4m0Ysivz808HsrUhaE=; b=nSQTecsp8PYK2hjw3w7+6K59/kReqRamINME6coYDMBhd1a83YjaMNsLaY84Uzbm4alwrDEoVAFEGwQPmRpeQGkYPc2pKlz/tPB7aJk5+AmZbMXHeIuW+1Schr2QClTXuV3l6r/hGQQABGfYBOGsEz3E86PamONHX+K2P9gqmSLtFi/F3PlcoOXvCaY72qJBf/h1CgH5Lp1FQw6rJuk3k/9HRF5GLBI1gP7vxu8Y2L0OgWo73n1kUTKhY+2JN3ZPMLxTUkzVXG6S13IQ1BBSiNVDhSBjvnN95TetJrNSjDJazZ6vpVL7tIUgCwWqnyh9DH/8h1yaA63HBWhAKtCAwg== 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=nDPSSwAIC67wcFoDaULuestfB4m0Ysivz808HsrUhaE=; b=jvznYOwjbS7InwNMYPpbeIufIfRCcTMclrFWyDyiIQeY+ow2B4SLUMjpYAf1CIgoX94m81dg1sQkaFBMWWTtzad4ZRJC2GEPvLT12oqtFeN95crfBdDD2VrJmj0bDwZs4hD4kEW5AF1eD/kWKAdl3CEgWnDQ3mDLe66+PiBYamV95o+jnRXjN9DwCwXQzkvl027F/q+A/56ngkZyKDXSL680xOoZ5nuBkfEWk5geYNWGyhPZE57MeyaR5DAryF/fVL/rZZww5IvBkrlTHekF1eGY1Zk2GNY3gB45zoDFWTMfVt3ASdcD6Jl+fU++JjufVG29T5c2/l3fwgvpEkuxAw== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by VI1PR01MB4717.eurprd01.prod.exchangelabs.com (2603:10a6:803:a4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.18; Tue, 22 Mar 2022 12:35:20 +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.022; Tue, 22 Mar 2022 12:35:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:35:10 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [aX+27Sjq096bpFATpUEHZGew+7fIdlxc] X-ClientProxiedBy: AM6PR10CA0068.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::45) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123511.368793-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6ff8d94-6842-49aa-1ae1-08da0c006d59 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUXiI7VfCKpkhTERZyvrrRoUYdBT4uzzA44Z6R1M//EbCszgEJ028oF+26RP5/vIiM63TPmk6qq9N/+3EPXAeqD8H+zuLCgxjRvJuAKzwn+QiVvDPIJpZ+Da1w6z4iVLUy3v/iN1pTcFkZEyI3EMX355R3U+d5qLw1pQ9FcxB3dNfVkm6JHd8tMytCn/inssM/zIJ+AviB9eitGuFtxZRbtXg6r9pmIonwDInOSUUX846VxCXbn6xurJCMv6yj4aCFgoKwIHzT7AAN6F/bRtCSAgJZnREIr0kkdQBHRcVqTZRZrW0TUQ11ue7xj/wyWKMuV9krl1/K38jYYnlImYTMFNPPOYIUcroc0Cz7ADmX4jLQuP0n/EPJwHcgA8icH2A9dbljSg3AAuWiMreFgN8LRKA6I7Ib0TaNkrpvUfk01sA/M3NIY9mtpdFvHHDF4CcOjg1HfDRJY9oMAoRdCDYdQ0FMPbXj1fHSqPopUjGN8YYYV53Q9UZtaMPdy4MfYhp6PvaaOhrMnzHEwhOd3p+NSQFx0yIhJMZG7u47GoSMFa/8h7OEEf2QTBUdrMwTPx6VPX4B2scV+SdtQBn7gAZIwlU4o4yP/aNo+F/C5rzosMhtH2ZYrO/w+tR9VuWmNHUQn0YntiKeJSFpwYAwanc7XDpt0ph6ErJxfgM0SOhLPnzU7VoB6zxNNF1bvk/Ey5JywH41fQf9Ai19FUn0xMNYoBDSaDYlDWvA= X-MS-TrafficTypeDiagnostic: VI1PR01MB4717:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YgiGi6+dxLs6VnSu18Rqk+M8Z74zbxbijLnZ2Nrp9BdE0S2ZyjNcg+t2fYm9r+YZ7R/yOcPU7UOSqbakTMnt/3V3hQcEzR+qq42/uo9ITChKFKT/OzHyuZ5Ck4+V6P/AoQFFOCcydb5QSL3oAAPcDrd/eZSVuOEvAnMcOY5xZyrzuLcNqrMUuLw2dALw16ODPra3YFzPfog60IzKiHZvqZ6Zn6lbv3ol4xPpgXFiyDgRK3tjPm3oV+aEPZRIkVHVS4kp4rXlXYqR7bVUwleQNHRJgXhsgZjO9tbKqUUjSYY0aHQenQzVRQvpfIfM6xbq7/Hg4cQRr6U7aZbmW60MwJia19lRyRwPT7Je5J0LJZO2Kg6mTgyBM5B7PPWHty6L3Lhm1LxN43bkVsctnYparE1UzR7nUafqoWSkiMuu/gyqMHSF2ABBjPxnT5JIELZEW3FQAtExvohBDO7ZquJh6tR+hb+ryUUi2cdG859DYXw4hjIcwyjHkJ7L3HQ2S/KqP+YVpTiYNFmQ656XexI3K7sxPrhw5sRRyo9Ym+X/DEf4XKXRE+qsKyhmYfDa0a4j1RFRSLSsZDBbzIpvuj7SZg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: v7MDKiEEyGneU8QZZSBKMkD6Yo00QJrbrbOLez7vjQXuQgeG0vN9Kv8zY6Upk9OE9OJiHJG35bYaruM4RqfGD50SiFhacunm0sYExch3IKr5hXPzbIa3Fg8EqNCEztraaGFlwwZ2RbDFpJEuZaj1VDN5iI3yfGoRqZL6FH9khxlT7mXH8AR5pldVAyWVKnL0YKvkjvKKNthD9pin4BMU1G3U5m65OJI2ceuctsVWGRHoxun3ZZmb3M/tw5NKy3CY3dRh/Se0w7YAPPR390+x6ihgW5bQU+sCx8o3772IwOQ7rkFnhRJ9rZw3Kv0oSrUqUFf8Bhtq+mjA1gPO7eEj1yrjjjB6CE2Ac8fpQPHQSZrLexPZstnBw0togWqV6LByh7H45eBVTz2ohIkMDu/2lENY4bF9/t7r0Uw0g8tHRMCVrAqlc7FkQOjbAEwRCTHOYUUFcuBVYrRRmss0Te6s4tjnUuUWrkhmcuhEQdqEpf6dAqK/mihYx/OOYDUva6MKfi59vC1UyzIyYxxLY7lbA/7dHUh752EbpYn8Z0+juZIgmtlgsqmtgk8LhyLoHwOEbmT4aLTC1XqTlHbK9bZi6eMBHWDV0DfpVg2Mvw/+RfCy2R/NbDWE0lirV9fn4ce7h7XW9fkYReRw46nNvWZuUzMF0Ubu7bmrhKLGDxx/yzHop+mf7Vfkj58/+ttssM/dO3z+8ThfK3+nNEMeJpq6NM0p7ICoYVJOwDLZLTTtIOicmYyvlG+zY+rcQFQZkDwPDSf/jSpOUQS+TK6Pl6YOon4WSsB5p7QcO/eFq7OdGDWTGXWtjAs3zoKWKYwnz8QM4W6tVfknc6h1kEqYCa3NwJY5ekHaPNWF6lWwOZxdAwCBc1nCpfen2QKZr54gCgsW8536iPn/KkzNJind1qENKOHb4hjYB78qwn89bDbLGTMn+CV0VYYaOSCyGx9fdGwgswBagMabU9SbyzUETybOd2Ur2Cqw1tm+0IzsnmrOFobqKd3XX3hh+Zh/WNDauHkWFBmtQogQ2NsrR/wKOfyM0gr1nvuA4a7AkuZgB5w+gYNHw/Gk4rKK3Uob1+lF3uIcUOC2velFHY6BE6L2Ngc24rLWsiUb2rbJ3jjnwzXUUjpW1/lU5b5zSfE2SYrAZ682E64rXfoXqap5vGj5wq1z/ZMOhdcq+ez99GULvzDdrcY= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6ff8d94-6842-49aa-1ae1-08da0c006d59 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 12:35:20.2310 (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: VI1PR01MB4717 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec, avformat: Remove unnecessary inclusions of lavc/internal.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: Z9bmWf8m59Jq Signed-off-by: Andreas Rheinhardt --- libavcodec/parser.c | 1 - libavcodec/v4l2_buffers.c | 1 - libavcodec/v4l2_m2m.c | 1 - libavformat/chromaprint.c | 1 - libavformat/genh.c | 1 - libavformat/tls_openssl.c | 1 - 6 files changed, 6 deletions(-) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 24fe44eb30..49de7e6a57 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -27,7 +27,6 @@ #include "libavutil/avassert.h" #include "libavutil/mem.h" -#include "internal.h" #include "parser.h" AVCodecParserContext *av_parser_init(int codec_id) diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c index 4b2679eb38..3f5471067a 100644 --- a/libavcodec/v4l2_buffers.c +++ b/libavcodec/v4l2_buffers.c @@ -28,7 +28,6 @@ #include #include #include "libavcodec/avcodec.h" -#include "libavcodec/internal.h" #include "libavutil/pixdesc.h" #include "v4l2_context.h" #include "v4l2_buffers.h" diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index cdfd579810..3178ef06b8 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -28,7 +28,6 @@ #include #include #include "libavcodec/avcodec.h" -#include "libavcodec/internal.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" #include "libavutil/pixfmt.h" diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c index bcb8315159..3953a5ced3 100644 --- a/libavformat/chromaprint.c +++ b/libavformat/chromaprint.c @@ -22,7 +22,6 @@ #include "avformat.h" #include "internal.h" #include "libavutil/opt.h" -#include "libavcodec/internal.h" #include #define CPR_VERSION_INT AV_VERSION_INT(CHROMAPRINT_VERSION_MAJOR, \ diff --git a/libavformat/genh.c b/libavformat/genh.c index a85d38dd31..b1c20718f6 100644 --- a/libavformat/genh.c +++ b/libavformat/genh.c @@ -21,7 +21,6 @@ #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" -#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 1d813cbbb5..8bf766c01f 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -25,7 +25,6 @@ #include "os_support.h" #include "url.h" #include "tls.h" -#include "libavcodec/internal.h" #include "libavutil/avstring.h" #include "libavutil/avutil.h" #include "libavutil/opt.h" From patchwork Tue Mar 22 12:35:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34891 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp671282uaj; Tue, 22 Mar 2022 05:35:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTN2fk3sqfp1rTaDHGtVgabRV12hNTUlvLQM5S5vtNhdSs39hw5INqq2R7UCkgBB2LdwPv X-Received: by 2002:a05:6402:528e:b0:407:80ff:6eed with SMTP id en14-20020a056402528e00b0040780ff6eedmr28435692edb.165.1647952545674; Tue, 22 Mar 2022 05:35:45 -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 26-20020a17090600da00b006df76385c0csi9755933eji.172.2022.03.22.05.35.45; Tue, 22 Mar 2022 05:35:45 -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=qNBHbCIP; 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 BA42D68B1D3; Tue, 22 Mar 2022 14:35:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073019.outbound.protection.outlook.com [40.92.73.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1075068B1C1 for ; Tue, 22 Mar 2022 14:35:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nMsTc/mQvtyAMHR8X1olHZtihZDbLcYleEy7y+l/KNAyC/aQjMSt73r7M9z4NWvR7FthylTAfLemGXf+/QScMmHZVyNwzbCmpHTaX8PON8zvZAoC+Ws8/PvH8KGFEDVEhUxa19+0BXwhGXIwKDBEeSs037I/RgnL1SGYOCNLwZrnv+Wnp/dK3B8SL5WcV/SGqOj3WCOlh1ZyvM/uhJT0O/rcKVGSzIGXgsjty41Fdg5aMSBofnNiozG9YjIjeYJZVZh9OO+OEa2ExbmLu0ofCptH9zAFTFRuC9d2HU8JWW0ZYiW4IAg/Xokf8P7r/XR1B3DAkx7/s3z8qydvFjKC0g== 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=I+xu+70YglZ5ri5vXh1O9TrXUyioLpDxRlNOjI15o0w=; b=RYesRUkC9PWq64Y9qsXAeOsASln3N5uVj9M2HjaQQrLDJRHN3vc79qvLGuSfWsSVf2kG0X0QMMmbeI/XWs3k35D4DffO47hLmgmqF4Y0e3YBCKj2G6phfam6mUVRPCBD1dAe07+wGm/0l9T1NIuBgkp871PBsZTzKYyrZG8XSpQgpgxkVeoXMsWyZtwU+IIL9bRyFCOBaFKYaTUl2iGlhUllRXlG7j9RxAnHqb0rBMSXDrM66q+nLC3KnDpx/Z1aOVUi0vUlYhhcdxgoLS0nk509C9FreZ1BWL8uy/hQpwwYbGM/LIBoZj5+WnSILnCiGhNTloLWhvk9H/59PTDcIA== 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=I+xu+70YglZ5ri5vXh1O9TrXUyioLpDxRlNOjI15o0w=; b=qNBHbCIP1eDEd2hlyj0Skv9aG6ipVFwfMhKD86WMGrVR0dqJBcegYHt/zF0PJjYiHdEbcmrTvLcuhcAzOhiTXZakrcqWEDk4D2EZ3x2VZEQ2JbTxZ4YCvcdVkj3Ed1YKHoS8x4x7RLRa4yvMMf8kTteNutXqIORk3CnZ7t6uzl8BJp1LuYWCz3G6NcjdPCV1LpVQ9xiviNcCatnwNyGhYkSDbubp6dAqfdP48WLOJ8QbP5EZmMZFn0beWi2mh8PC991yTIyIaxZfNufyOeM8X2BGFylUmSOCMjJUFHkbN4DtewromML948DcsfGWU3oE0gESxUXQpbJwfrQqCwyiLg== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by VI1PR01MB4717.eurprd01.prod.exchangelabs.com (2603:10a6:803:a4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.18; Tue, 22 Mar 2022 12:35:21 +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.022; Tue, 22 Mar 2022 12:35:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Mar 2022 13:35:11 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [t763zaZwjH8KEzs16HyjO8tMPajfFiLs] X-ClientProxiedBy: AM6PR10CA0068.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::45) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220322123511.368793-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d75d747d-c91b-473f-f7a4-08da0c006dff X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuR8JRu/bs3HbiLUZ4BkXFvYcqTM4AdjhKSLC5C7NjznxZbfYzoX7nOuDR+Aleh5vXW76V4SFnsXsoydUxeT6SjxRe31UqB2Do2FPtmV70zkqIn6Y+K95MMev72GcIvxAwYfFhu/1J2lF5PcZoi50c+zogjtQYrCkVNXzK/oTRrJ5Vo/wsKBTPT7GB1fYuAsnNE8a1YSUYp9pR1gA6JhFxpNwSoDgfOoQe234Kq9sFNbBotBCyYGX1sjPn9jhkkb9uJPhHNeFIxzvrvm0fv+fpzuhCDhvlt6zdyxZTjctHUKM3cxh8hj7lYk9pGKw5E9n9xYB+oM0/7A0F2SjWOs1gEKX6KwbBR/uyHGCCLohEgh564PqQclKA0i3H/R66NlsiFUC0f8xnJ7AdhdRB8UWRluq066P3du887lMlaT8oOYXWoxFD9oA4AoM6qQUDMoahQ9NsfCukEG00BaIC+MPu9rk3liOhOSv1fRuzk734xcN2ilEiCaH6eUHlQNCRoRXh2rYQzaNU3zN3I/CN24nFuqbYUkLBVSO/Y/1N9xLEKodrsOBKi3Iu5Axg7LZDC5Zkt6wc83KXb1UpLmPVdW2YjAPT0kECD5Ood09t5Bhcl0oNrA8Z6H/bxDuyeEqkMTq1bFswx60usoUCaX4iKPgMK1y8RrO58hbaE6Z2Y5LdUAobnAl+ihrREWSSuzJSnzx7+/F+Cas4ORnGZ24bsIgh9YOAjo9rHQz882YQ5iA9PfD7CYwpwA7rROpq4rvg4ovtjiBNv9g9VfTxXtyaUG9t6 X-MS-TrafficTypeDiagnostic: VI1PR01MB4717:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3vLqOPDgEikiQ3EMnP7pfIOWtZt/LRP8h1RHsf9ggEPE25IU/zeac3n1hecp55Q8DptlxyWTXjPDg5iHy9quYI15NRSEUw60Jz/oTlefR38Whf+Zk+XvtFdGbFaRoY2EQZvwcssENe4FHR89ggNvuvePOcVIb7UGUeVfgpZuyxSqBgvNmiMXa9ng0L1ceil0/zbRmByt2r9s4Wy3kzDG/u4881AYw3+jrJfI6D7jLHPTUOoXC+E/G/4ZU91qml0lmwSusYZTbfSyML5EmEOUIAuMgSkPTHrp9D7CkLGUU9EiTzNIAwub/x7BBj9drrdfduPTWaaUcrGLu1CrdNdInWhf4NPPxVH9fZaAsSqPBG6IBzPf17i1i07OEqOqFEPOlkj9oguJPJ4qONXCa5xbjeB0hJhb7Dbtp8ayuwPvsoibDqUD7H0PGxy0sn4oLiJWLjmtMG/3SH2HIUc+ZSao/9fNXqEPmOW0b+hfymPpNcvEpvEyocFwU52aN9C4CK6YsG/pi91jIIgLDA9L1TS+jRQOEzVY4Fa4EcENjRQpdGn/xqb6Msgjga/aNORT/3rOBn5i2Op/8E5vjqEoRUyShnVfb7ZhrCBYHGKroSSg5s/0KwCL7cWTWTGgEHUaic2LDi+/K0P1pO5r7gCN/nlTHw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xDgeBYJkhVAtQBm58UI8DXRkZRRfxNaNMGPsevvNXSa5lJt3hA6NQN7oTGd2c8SwrWxPgoYcrivWUH3ghu9z3i6wdTMM7Z5CtIU0ei74rgon5g8mm+LzEtvh37kN5T9X4oSeRpW+lmEhXcOptJtSFkr0pkQy2PBwws6Wu1GQTngFgp+3wWrcNtFI4FU9+kxHLY2AMNX2jy8N5zElz60v5Ei2BwGZw0zmq6qIDZQX1KXNZL1Cwixxp2Lqxlt5Ix3mnodNqDQEUiaBkLWQ2QHFQ1kUeUlAU+FKehSiBDm+8XmciMWk6y+L3LC0x6CdCEADquIhOYLV9+0fyNLSNoMELAH8OYawvKeACC+/fFg+iPPAJb4jBdMOCdoP8XSiBlzXBG/7FwweCeJGLeqYzs+gzhtUA8Y1jsx+mhWfkxo2im0aHhkDTRY1aGEfM2RWMALa8CoMDS6udI8iSdJ9Tp0I4wdsykkYlA27T3yh6oTTvON6L3FmPzWVsdfPrRBKIBMDgJyABV55s9oUK4d3OO6zafu7stzVpzY0y6tXqzhJxAeJQrtnTidHfg3rcYl0+zgwN3izleA+lPm6nEHX7+DER1LhxUBbEfDsTDomfZeL7587DVyH3J9H3ZsaEvYL+xx+qqMcue/bTBzEXehaoqE9tXhFknxw+jXZPu7faSSSMZG1265IzFTXKxKKSC+hPCQdJxj8NvLzQyzhypjsUgVm4uhRdB5cBoG5VhqFt/3LemQr5ZhjGzS2Rzm14Hx7K46/MIzg1Rz9q3/IiNCqaVdKAnTleHDnoOx0iIxfgoTTo89tczMI3HKuZ/GV3finmtXbcbP099Dmyxs0ve3P5LD/l6TT9WrRNqZYlsmfcb6oOnnb4g2K54RZSbKDBxs00GuhN1QKtkvgIOme2B9rPOS3mct75TiH/8+3G+g1fXXeK9PxbkzsyLZP/TuCYL+SwotJNRW2dypqbsmHxlCae+9mq8xOPMKMyQfYgvN68freL0S44ah18WFX6Iv3PKiJQ1lgkgNQ96O9U3TcDCBBz13Uf0Z64WiQs62xE18qp89HDt5W1oC+tYRYByE+fcwLTYl3mtykmiSQPbwdCA3VPNUTKsGzaZ233OLmyoGgxfcRwaH3tpQlFK4/UNd83xSE/AtjO9oSsRUrLP18EAh9M9/wHGHwkYhKw48MHlo/kvEnyg8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d75d747d-c91b-473f-f7a4-08da0c006dff X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 12:35:21.3570 (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: VI1PR01MB4717 Subject: [FFmpeg-devel] [PATCH 6/6] avformat: Remove unnecessary inclusions from libavcodec 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: BZwu0Qw43Iy5 Also improve the other headers a bit while at it. Signed-off-by: Andreas Rheinhardt --- libavformat/a64.c | 2 +- libavformat/act.c | 3 ++- libavformat/apngenc.c | 2 -- libavformat/av1.c | 2 +- libavformat/flacenc.h | 5 ++--- libavformat/flvdec.c | 5 ++--- libavformat/frmdec.c | 1 - libavformat/gxf.c | 1 - libavformat/h261dec.c | 2 +- libavformat/hls.c | 1 + libavformat/hls_sample_encryption.c | 1 + libavformat/hls_sample_encryption.h | 5 +++-- libavformat/icodec.c | 1 - libavformat/oggparseskeleton.c | 2 +- libavformat/oggparsespeex.c | 7 +------ libavformat/rsd.c | 1 - libavformat/rtpdec_dv.c | 4 +--- libavformat/rtpdec_hevc.c | 2 -- libavformat/rtpdec_vp8.c | 4 ++-- 19 files changed, 19 insertions(+), 32 deletions(-) diff --git a/libavformat/a64.c b/libavformat/a64.c index 6e19162fe2..a66f2542b7 100644 --- a/libavformat/a64.c +++ b/libavformat/a64.c @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/intreadwrite.h" #include "libavcodec/codec_id.h" #include "libavcodec/codec_par.h" -#include "libavcodec/bytestream.h" #include "avformat.h" #include "rawenc.h" diff --git a/libavformat/act.c b/libavformat/act.c index fba106c520..6dd9f62a87 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -18,11 +18,12 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio_internal.h" #include "riff.h" #include "internal.h" -#include "libavcodec/get_bits.h" #define CHUNK_SIZE 512 #define RIFF_TAG MKTAG('R','I','F','F') diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 767074ecf3..88d4a41462 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -22,14 +22,12 @@ */ #include "avformat.h" -#include "internal.h" #include "libavutil/avassert.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavcodec/png.h" -#include "libavcodec/apng.h" typedef struct APNGMuxContext { AVClass *class; diff --git a/libavformat/av1.c b/libavformat/av1.c index 7caea0c377..79065d0c9f 100644 --- a/libavformat/av1.c +++ b/libavformat/av1.c @@ -23,7 +23,7 @@ #include "libavutil/mem.h" #include "libavcodec/av1.h" #include "libavcodec/av1_parse.h" -#include "libavcodec/profiles.h" +#include "libavcodec/avcodec.h" #include "libavcodec/put_bits.h" #include "av1.h" #include "avio.h" diff --git a/libavformat/flacenc.h b/libavformat/flacenc.h index b308d0d021..02937b240d 100644 --- a/libavformat/flacenc.h +++ b/libavformat/flacenc.h @@ -22,9 +22,8 @@ #ifndef AVFORMAT_FLACENC_H #define AVFORMAT_FLACENC_H -#include "libavcodec/flac.h" -#include "libavcodec/bytestream.h" -#include "avformat.h" +#include +#include "avio.h" int ff_flac_write_header(AVIOContext *pb, const uint8_t *extradata, int extradata_size, int last_block); diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index cb24b1cc26..0c90748422 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -24,18 +24,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/dict.h" #include "libavutil/opt.h" #include "libavutil/internal.h" #include "libavutil/intfloat.h" +#include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" -#include "libavutil/time_internal.h" -#include "libavcodec/bytestream.h" #include "avformat.h" #include "internal.h" -#include "avio_internal.h" #include "flv.h" #define VALIDATE_INDEX_TS_THRESH 2500 diff --git a/libavformat/frmdec.c b/libavformat/frmdec.c index 478656b037..e6c1179dcd 100644 --- a/libavformat/frmdec.c +++ b/libavformat/frmdec.c @@ -24,7 +24,6 @@ * Megalux Frame demuxer */ -#include "libavcodec/raw.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avformat.h" diff --git a/libavformat/gxf.c b/libavformat/gxf.c index d96e0796f4..e61291382a 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -26,7 +26,6 @@ #include "avformat.h" #include "internal.h" #include "gxf.h" -#include "libavcodec/mpeg12data.h" struct gxf_stream_info { int64_t first_field; diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c index b5161ff57d..0fca1a340a 100644 --- a/libavformat/h261dec.c +++ b/libavformat/h261dec.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/get_bits.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "rawdec.h" diff --git a/libavformat/hls.c b/libavformat/hls.c index 0541d3c610..83ff4cc607 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -30,6 +30,7 @@ #include "config_components.h" #include "libavformat/http.h" +#include "libavutil/aes.h" #include "libavutil/avstring.h" #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/hls_sample_encryption.c b/libavformat/hls_sample_encryption.c index 159a6edc6e..08cdf964b6 100644 --- a/libavformat/hls_sample_encryption.c +++ b/libavformat/hls_sample_encryption.c @@ -26,6 +26,7 @@ * https://developer.apple.com/library/ios/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption */ +#include "libavutil/aes.h" #include "libavutil/channel_layout.h" #include "hls_sample_encryption.h" diff --git a/libavformat/hls_sample_encryption.h b/libavformat/hls_sample_encryption.h index ff3f9c22f7..d86eccb74c 100644 --- a/libavformat/hls_sample_encryption.h +++ b/libavformat/hls_sample_encryption.h @@ -29,12 +29,13 @@ #ifndef AVFORMAT_HLS_SAMPLE_ENCRYPTION_H #define AVFORMAT_HLS_SAMPLE_ENCRYPTION_H +#include #include +#include "libavcodec/codec_id.h" +#include "libavcodec/packet.h" #include "avformat.h" -#include "libavcodec/avcodec.h" -#include "libavutil/aes.h" #define HLS_MAX_ID3_TAGS_DATA_LEN 138 #define HLS_MAX_AUDIO_SETUP_DATA_LEN 10 diff --git a/libavformat/icodec.c b/libavformat/icodec.c index 2e677c78f1..290f658d0c 100644 --- a/libavformat/icodec.c +++ b/libavformat/icodec.c @@ -26,7 +26,6 @@ #include "libavutil/intreadwrite.h" #include "libavcodec/bytestream.h" -#include "libavcodec/bmp.h" #include "libavcodec/png.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c index 532fa6aefa..2016b16c95 100644 --- a/libavformat/oggparseskeleton.c +++ b/libavformat/oggparseskeleton.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/bytestream.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" #include "oggdec.h" diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c index 7d3d653384..d20d14fa41 100644 --- a/libavformat/oggparsespeex.c +++ b/libavformat/oggparsespeex.c @@ -22,13 +22,8 @@ DEALINGS IN THE SOFTWARE. **/ -#include - -#include "libavutil/bswap.h" -#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" - -#include "libavcodec/bytestream.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/rsd.c b/libavformat/rsd.c index 65316f0219..c3b570da22 100644 --- a/libavformat/rsd.c +++ b/libavformat/rsd.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/bytestream.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio.h" diff --git a/libavformat/rtpdec_dv.c b/libavformat/rtpdec_dv.c index 53a5855ad3..fa75a77a84 100644 --- a/libavformat/rtpdec_dv.c +++ b/libavformat/rtpdec_dv.c @@ -21,10 +21,8 @@ #include "libavutil/avstring.h" -#include "libavcodec/bytestream.h" - #include "avio_internal.h" -#include "rtpdec_formats.h" +#include "rtpdec.h" struct PayloadContext { AVIOContext *buf; diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index f467104ca5..a739ed5bd2 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -21,8 +21,6 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" -#include "libavutil/base64.h" -#include "libavcodec/get_bits.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index 360dd5c782..6701ad59f9 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -27,10 +27,10 @@ * @see http://tools.ietf.org/html/draft-ietf-payload-vp8-05 */ -#include "libavcodec/bytestream.h" +#include "libavutil/intreadwrite.h" #include "avio_internal.h" -#include "rtpdec_formats.h" +#include "rtpdec.h" struct PayloadContext { AVIOContext *data;