From patchwork Mon Jun 14 22:41:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28274 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247633iol; Mon, 14 Jun 2021 15:43:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLuAtylDJLBsEPon4140MwC524pir4upluYxPSfcc1LffbjYAToP1W20asB/uukVG74RCw X-Received: by 2002:a17:906:6d51:: with SMTP id a17mr17599995ejt.543.1623710631533; Mon, 14 Jun 2021 15:43: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 j8si15315528ejk.224.2021.06.14.15.43.51; Mon, 14 Jun 2021 15:43: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=qM4KvsCz; 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 65A8B689C38; Tue, 15 Jun 2021 01:42:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2058.outbound.protection.outlook.com [40.92.17.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 814AC689AF5 for ; Tue, 15 Jun 2021 01:42:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d3zfSWQl5ip1iO/kqIlDFe8s4WY7WET87aYMf0G2Gj198gsU9xFOkyHqVuDdW8hHEVG/8joOcudZCF9PAwtxO0BvsIbloATjAUqoucDDkoTzt0XwmDMsmxE4ANzgD9gv9uWSU1u2H7yFLgh8YogBvSnsD0CGNZ2gyTNazjXJ5rdAjzW14v0Y0qsyPge/AB4oB+1madbpn227PnJnwmh8jibsY16BeIdM8vlQ60JoUGvefC/ebopK8xKnxjJJGn0Qn/8eNCVnzzvkQmFN+Ox0udfTSSnhvlo2lY1FnJpWV1M9580vuQIX6c7Uriy/WuorcUAFfjZNyoA0HUEL3Zkxbw== 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-SenderADCheck; bh=lraPuZxCiLoOyX+qHb5RTPS5fXp6pzTPNKOekPp6oqY=; b=VIwNwUXMMOLo5PkzhBuJ9nFMrA9921nO3OPvr7iYxjA0sK83DRwRppksFJ7FDdseNoW/Ui+GPqGCJv6sg64QtWjbCXcqb9Gdp+/fIl8GXJmf5bfPpUczL8xvzGnLAG/m3t8Y+8PsobDv6zX35wKTvZ+T1lKzu2xxxi6QVprbt5kIdTX8wx3rD1FCjBud5IA1/09FV2D7IJClursyDFdFZULBYvN7zr3zv8nm28mxKEaY5Kd/Wfy7IsdvETXKXGCQCnr+qNO1B6oP8E7TCb6Ulh1WBChfvnve1mjEQ6ptUxohfQ/O/vetvBgqvLXjXA1Ung+NSy04ewQCADdqGCgo4w== 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=lraPuZxCiLoOyX+qHb5RTPS5fXp6pzTPNKOekPp6oqY=; b=qM4KvsCz3MvNw/Pk303+7KUTXo9rKe8rORZ9WQ+0J/SKc6app/R/pK371MH/BZ9YLfi+aUYqWUkawI33vj5z5Q5niB+yRQKNJICvwxuo8kdwRpo4BOjOZOc9+GQV1e+t610TFOIEXCmnjNkqBolhAKyY/Jb7Lr8Pj0rxBeUROFo6KYc/aqVQttaErcC1ZGE42rtJiIXB8Be9smaXgjMl63S+yVThzu459YYL0SljnvNBjRYOcoEwwOXmfGvLWoMa+QwFft/kbqxrumUZVLErsFksMPq6MxZDk6KcojGc7143dPoxfGk8yKgBwloMCt9Kmz3vwfo2d1jTnm+jHErvwQ== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::40) by DB8EUR06HT107.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::405) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Mon, 14 Jun 2021 22:42:05 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Mon, 14 Jun 2021 22:42:05 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1055ABC13A5FF892499B48369A2DC3B6EE75D9A4651478780FA6B6963D192B80; UpperCasedChecksum:8E8B7D2B21CDB44738EAF3C624569ADB37554E66D504B00AA692AEC2352C355B; SizeAsReceived:7600; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Mon, 14 Jun 2021 22:42:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:27 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [TsXimiU1PqTzZi+047gLsaUcXMsxqkMJ] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Mon, 14 Jun 2021 22:42:05 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: be1eef1a-56de-4e2b-f4a9-08d92f85a27b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViQP5DY1gVUR1zMefR9ogQsUGOp37HAA3SSGK14qe5Gld/Br5V3ps6lPNsul8HiMaPhIW6reiVtrVfOpSaS9Hq/wKReyKgMDCvPw++MMO0SL7Va/YreNtnpvGfbZ08Fpjl+yUDaOjExZgspUGgZVtKxNh4JiaqIeQLe39WvzRWYPcpRoAk/C52rOmsUK6mbyqMFMU4spzzIOF+NurVbXUpeHU0k4bYFhyFpqXNXyS7eeCPEp0gL+5PYjKSTdZy3TMOWj0m4nNsi7aaOJh1VYJhTaJ6uWtIHRaOiuwFppW1zWShqnhSpDS84TDGzUPSAix3xo6WUOhZezCcMTDCRH8qlOPGad8Q+2eTJCKBmsgSE+NGFiD/sMpoS/S6Dqid1XqIPI3HXW4XEAtjoujTagKRXNROTHlgzw1Ho5RkpC/AgBKtCAPR5DtDyOztMHje2Mw2THBp8YGv3EFJoCvubyW5XrjFd2eNwoSEboirENJbC9xzuuCwT3GdayFYVnc3O0RoFFDPd2fa+dDbthCkrAIc2XdqC7orZ/Uu0q78WNpf89Ea8EFLDOs1Z4fXPEtX0L9eZHIjTYfIpvoDLE2OS33eDERwZVLVGsEUHv0CQVS7IiSSrxrNp/OUJ2fMuAQlBk2SX2tNZN8xLD9PZAdN6iNP7t69l85rM6mS5uQM8KMnfNUwOQC61hkC3Uu9XlKy0j1iPDHtnEfx/g9e9DALfbI0vILEDd63v3c= X-MS-TrafficTypeDiagnostic: DB8EUR06HT107: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 70UpTBKgBybeIX+cpEVP4voEX/ZacNTS3U2i9zZgV4Pw7OYRSougEQJhMkIC+1dY/htpqsto4NnzVkfpvfeEHPGMPA2pyDiWn7IgTAnuBTc4Rj6iZYvzsAAYOqLStnePFiiFktxINNrn0kMeXmbLYLgjuqdicPRtHqe/dhzyBlwDdnzSEZM24wIUs/WSODXGBltoz0jvuA1Qusuijnyh81JcGyI6lLPKd3y/eSlLI/mqFrgkwn0mWjDInvWG3xDknTkUggGfYayvfDLEsWpU45boFFwzCfsa8DFQTiGRqlSD/fd0BedShRVmjP3f20z8QLuCz8Mr0vdQjdcyE7n50zKOTzyxZQw1c4dzIXXrGbSRCbTZDmYxtlh3/FIWCcTBKDJPehgI7ydTh5G8KHIeqw== X-MS-Exchange-AntiSpam-MessageData: dQSpd3qqiL/4xqG9cRF3VmCIEl3n2wSjFnJM57yKhUbYdLfy/I42/X4NrQCcpG4Ga9Yscz7nKWuD7ZoQ6CHeB3G9kUdbjjDceGo3uVZD3SlXTqKF7oEDZZPWgv3yjC8MDVqFcfTcvyIHnnYYaXyClw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: be1eef1a-56de-4e2b-f4a9-08d92f85a27b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:42:05.4953 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT107 Subject: [FFmpeg-devel] [PATCH 11/17] avcodec: Remove some unnecessary mpegvideo.h inclusions 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: 89YBVN55xQrl Signed-off-by: Andreas Rheinhardt --- libavcodec/h263data.c | 2 +- libavcodec/h264_slice.c | 2 +- libavcodec/snowdec.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/h263data.c b/libavcodec/h263data.c index 20d0436fda..c520df3574 100644 --- a/libavcodec/h263data.c +++ b/libavcodec/h263data.c @@ -26,7 +26,7 @@ #include #include "h263data.h" -#include "mpegvideo.h" +#include "rl.h" /* intra MCBPC, mb_type = (intra), then (intraq) */ const uint8_t ff_h263_intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 }; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9c2301d7e0..20055e6f7a 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -29,6 +29,7 @@ #include "libavutil/display.h" #include "libavutil/imgutils.h" #include "libavutil/stereo3d.h" +#include "libavutil/timecode.h" #include "internal.h" #include "cabac.h" #include "cabac_functions.h" @@ -43,7 +44,6 @@ #include "golomb.h" #include "mathops.h" #include "mpegutils.h" -#include "mpegvideo.h" #include "rectangle.h" #include "thread.h" diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 7367176f07..1355ae6ed1 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -29,7 +29,6 @@ #include "rangecoder.h" #include "mathops.h" -#include "mpegvideo.h" #include "h263.h" static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, IDWTELEM * old_buffer, int plane_index, int add, int mb_y){