From patchwork Fri Sep 30 02:17:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38472 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1398667pzh; Thu, 29 Sep 2022 19:17:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6XwKofRI91wg9cq2rnWYFNwaz0EoDqiqw9XvZaAilAC+hcwPJJQXrSoUknQKjY0Omf/V0k X-Received: by 2002:a05:6402:2201:b0:44f:443e:2a78 with SMTP id cq1-20020a056402220100b0044f443e2a78mr5866787edb.76.1664504259666; Thu, 29 Sep 2022 19:17:39 -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 y14-20020a056402270e00b004582a378873si1088467edd.447.2022.09.29.19.17.38; Thu, 29 Sep 2022 19:17:39 -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="GFG5f/AS"; 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 9A10C68BB94; Fri, 30 Sep 2022 05:17:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069096.outbound.protection.outlook.com [40.92.69.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1AF668BB3E for ; Fri, 30 Sep 2022 05:17:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SFR1l0540SE9wkUwuqPJCUaBuTICRPTs76VqRw3snm4q9jNjAKUVxYjXlY8KqEqzBBlj25YlVzBcM/MU37w8dGe5mAV1V09m5kzvDPokX+Nz3E9EOx0sj0Zr9jgUiuUE8aiDTjn0TglAcwN+Xze+kFFMF1y1xTiwiZQwLAZ71Kh8D90gTWnX1FbPV3bPuYP4C04LBugMZDwTCbjx8pICNBQ1eBZ6vEDhHXzYkbc/mrlSTAfc9fkuNkG57u1RhOZzzX4krwvJfDnKlB9kILx/xzvlqGqkEAx4T0gy2+dVtkmlTH3DD8gNk9c00Ra6aVrGmYbR74BN0emkPFC5dKAV+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=wmc91s3P1Zcib04ztesKE7ZArAN5uW1MyNKFx6vLrE8=; b=Avva6DvpnG97uqRFclTAXvR/0wgsbRmublGbCe3omfHAozr9tVrPgqIQvSa5O4Rx6B34PV+irdD/pDV/3kqOtFdA7cq/i+tfMVNyeyUGtBtdcTdDxRjsWl9nMtceyxEREvPjR0TR0KujMuPfXgR22Ap8oRnvAFd9UuEDC/SKmYBq8R2t2QS9BDz4n6HEEtBttP/Ss9n8gz2kI9ojjaSb5K3eB7UAfQjcamFdbdsE+uxRMUtcQIpFc3+b314G450mKIVdaapoP/I4ZtJ6kMIkbr7Q6gG+y/eN3RBPNhlUdfI/YvGw8tWOG20LwwSzpplYDFFAUnmCK0L4+g9yHjsfbQ== 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=wmc91s3P1Zcib04ztesKE7ZArAN5uW1MyNKFx6vLrE8=; b=GFG5f/ASMt8BN+p1RUX4rv5oGumeKx3xmXEZTCquKlOwcZn9+dnSKb4PX293KpWEQF/kZxEwL1vXK+ME0zwwsLIDmgF9NiGa5JPPL0L/wLkvGTuQBzH45JjX5+zBFtDC3Pc3CBzYxP7FXcWgQ4bRIrcQ102Bv6b3JS8cnFVOKgJXdfDYoDb3YEdkIpeC5BNuhu04Oh+jKA4wMkl9Il4zGelmmBHoiAWqxeaVDywLyRztkxVjq51AND9JfRuHNC8h4BMVezCZfumuyARjgekfPRnJcPF+SYiKV6o0deguyuAlslWC3QWJyfiEPI8WKfNTmjhiC9h6xBzowV/gU16uyg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0422.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:285::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 30 Sep 2022 02:17:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Fri, 30 Sep 2022 02:17:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 04:17:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [xgLfcWPSiLE7tSpwKe4C870r4yPlYQxwuqmf5v3aihw=] X-ClientProxiedBy: FR3P281CA0160.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930021726.3048145-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0422:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c5acf57-256a-4d6e-3d0d-08daa289eb1d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmougXX/gXRJ/glWGV8cWqUROIPgdfbXUoLLTM1g/Jf9bAS0SIvmXQ+Qd5f8zcEi1d7dQtS2kTD4SbVNuMikYsbbccE3VDX1Lf4ERJ0syCuL2anfz6VK9gsHTtvSjOIFh6dFSRqJrdg/76hgeZFxul12lwd9pcAVaheWxa+JMoRzUgdNH1lPJgH3JeQQ9t1/fE/Ld3G7CvhwMd94uGPdxN5QzzPYnFoXousTdVbJeuhtDydwXQE0z01/Yki32XRASL6vaeAyT9tvylpG8DtfhZpUa1p+n8qrkFE/3ZN029LemCrxYAkgIugyo0KcSpxBmlUibKikuHO/WOmuBsPIH4xmZlheAfsRsCcjiYTHKaT6bZXg+jhRmFyLfCjNQMI+T/jZye4THITLocluVWrFJhJf97oUZI7CXzpMHXbvFO6hFgL3f5edRhwLgAylOoXg8s5S3v65PDmlYqGA6+OFnWHkkUAQRB4kHP1mUNB4fDAGAmXox9f38IaRl1YT+xvd26ximwGAAZI/WOtIuqbezamZs/AXhpk2fGqMA6ZwNVFraOGeHXg5l/+hjaLLCNKzshc/+5QNVHibI26PwiIEEZYrx2lW1G5WhIxSN407ft2/jfvn9GobL067U4cYcb6WJ9bcT3rcWM1FLAtQPZwixqxzdcgPFguzV2CcNHjt3+kR7wxx/x9er7ueVgUSdK6nLdIfX1DSbwbkxd1/vMSRVljWof2qdEd6xh5Kog2bXOoASrM3tc9aAKoyJw7TnQ7ug+A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6jdWnwCBOkaRuzt2UxRhVt6rc/NPs8lq+9uFYkox4T9KoeFw/7Zd3bGA/HHUrg9a2LYZ09vPLYg0WZ7MxF7nQl2Tu+BGf8rrmX5EZ5JbC6vINWpwWsIJsgOoTxm3LGKspx5Jo+ho63I5BdYrcr3MUluagBGgzCH2jjRWvpAgVq4ljA4pBtXlv7CMgH572GjQU0Fyq7nj+ti8YTlmcXXBwK+zFAvIdHEeDBPqVqKPTZCLX1vswuuK/41dQezWtt1s6URYf1N7r8RG+cdgzXB3Eao+gmAExcwZifbFLFYAIGN50PkO39jKaCSYUbjnDIb1R4dLnBi/C+WPp8H+KPcOl9284vQO6AyRghknSd2H9wM5er9yWrnYMY2o6EWzc5gpxejgnMeBiyk8yqnGROd2rQhTRaVkJ5dNS5pxW7Ni+0AKpNBMJEGg9qI/2hLXziz8ufByoPjo1pR5/DnNAedwMCtiZUplOQXpPI1lKxYZFY52DRhJiPFrBN1JeJ4C9GK/P7po6RQ4yjjbhVuGSM574CVABsWBDRCJtCDRkgnaCSP2cE0PHgmWK6cyaPTMz2oWC8JEZcH8rTNvEf02Spbi9CCsDSC0+JVs7g4cwzLfRxIgGyekUxbUBC8JF1PHQRou0hIXXJLnUxiV3Sdxcj05RQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JUT/vMdNcLrsTkjkco8JElWH17xQplFNMvUwcGQNGHe7ZYQTFiGOAS8sp92YrQgxDxC78gRo/b7K0AQiuy5At0pF7drnctv+MQSn8fZFtD89zCEDp3S91RTMb+heWxHtXdQhux6QKVEubA5TWzfJAiSTDcyEHbPYukm+ekEx8/H8mG8rTUSLDkjiyXcLSCOKTJpRwAbdmRN5J4L005DyM8HGmSK0BstSQeR4bBU58mjGxbgPuQprFAB35smxT5Ea8wKhxZ/LNTxITP64irAMgPOyTf5yPYDfLScOa6cKA2/S+rHXheSpdX8bMY9078MFYOPv1KVPQLyAYizuxDe1mXw8EAlJ9kyLAjcIQriSrjG4otm8YxE+CR0Riokxub5+xOIf7jreXm1q2MxJnt8/JFiOUAvGAT4qemxzzbkis6IbZlkHOSSCrYwwL/39rhilsUfY7e1Pb9hhd2rcL6Ra1Tbx8Ten1JA/KZ9B05DxOrJykEdocKG65qKJhRpYg2Rwf+oC00rAtR8/HZEYdl3iYXK8/CO+JKkymkTYvHuoAinW1HtZvnJTFelh0L07YCAJYQh6TqiFiYgp2Gd0gJBi5yagAi1QPKCvY2TnMb4CMx29s4CtmIbR0liAy6oXrWHlu94VO27SOkJDupHEluHihdOUPJzf4hXqYSs+zG+3vbbYx0+tfU7v6JJv4aB3ERJufYX3ucwWKP3FZfyoMFeU9gFWOc6XavcQvO2y1KyoYQXObFg7OCnGMVAmfeAlVZvaArtX6C+07XWf17xvfMhcU2s13leulyTRBJjtM+ZOtbDIbKVEcJJMQJdnDC/p5o2C7b+g7uWAreX0r5KXI9HlZ1FodeQ3iAydUbhHij8fNNFUCwyljcG7TJxvq+C4yZb3wSeOMXUF/1E0ELygpfpUftL7e+KOv9M4+KzZo+U/6lU+604+odIT+vnDux2TRtU6+nDa49XxZ831hka8TuE4nyPV+/MtxWuXT3FJt2wDOR0Ua00JEzKjV5ZhpOau4uTqxqaHUVpeW2XHTUAa7YiQSG61p6M2805ztYdDFG49Ur5C6C8SBWwwXZT+dYYNxmy5TYd2NI5wfvvVeLSMXvn3A9GhiaeQKsva19yMhKgXZGIjBrogn2UNytfZ8Bbg79Acqtm5zzhsQRvMJAH07HLUVOLDBBSqfqqutOJWuQQ+KzxuAZctI6NirfSmqf99vpuQgiK0n/6UBe9KtAWZWoYoVn9gPNY/awlRysNDQb+PiqbmFyzlobLALoJbSawks6rVRy80DkNM5qgs4Ew2FcY5YfeRiXvPC63NkXAWKch3Zx9meLMPaMtVmGDVuDSxZfMv X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c5acf57-256a-4d6e-3d0d-08daa289eb1d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 02:17:26.7951 (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: PAXP250MB0422 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/mpeg12vlc: Move MPEG-1/2 RL VLCs to it 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: LqhYkE977MZK It is better place for these declarations than mpeg12data.h as RL VLC are just a variant of VLCs. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12data.c | 1 + libavcodec/mpeg12data.h | 4 ---- libavcodec/mpeg12dec.h | 10 ---------- libavcodec/mpeg12enc.c | 1 + libavcodec/mpeg12enc.h | 3 --- libavcodec/mpeg12vlc.h | 15 +++++++++++++++ libavcodec/speedhq.c | 2 +- libavcodec/speedhqenc.c | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c index 4da96d7da3..e301310b9f 100644 --- a/libavcodec/mpeg12data.c +++ b/libavcodec/mpeg12data.c @@ -26,6 +26,7 @@ */ #include "mpeg12data.h" +#include "mpeg12vlc.h" const uint16_t ff_mpeg1_default_intra_matrix[256] = { 8, 16, 19, 22, 26, 27, 29, 34, diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index f51faf4607..bc39655fbf 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -30,7 +30,6 @@ #include #include "libavutil/rational.h" -#include "rl.h" extern const uint16_t ff_mpeg1_default_intra_matrix[]; extern const uint16_t ff_mpeg1_default_non_intra_matrix[64]; @@ -40,9 +39,6 @@ extern const unsigned char ff_mpeg12_vlc_dc_lum_bits[12]; extern const uint16_t ff_mpeg12_vlc_dc_chroma_code[12]; extern const unsigned char ff_mpeg12_vlc_dc_chroma_bits[12]; -extern RLTable ff_rl_mpeg1; -extern RLTable ff_rl_mpeg2; - extern const uint8_t ff_mpeg12_mbAddrIncrTable[36][2]; extern const uint8_t ff_mpeg12_mbPatTable[64][2]; diff --git a/libavcodec/mpeg12dec.h b/libavcodec/mpeg12dec.h index b4e94a92ce..4c015d3096 100644 --- a/libavcodec/mpeg12dec.h +++ b/libavcodec/mpeg12dec.h @@ -24,16 +24,6 @@ #include "get_bits.h" #include "mpeg12vlc.h" -#include "rl.h" - -#define INIT_2D_VLC_RL(rl, static_size, flags)\ -{\ - static RL_VLC_ELEM rl_vlc_table[static_size];\ - rl.rl_vlc[0] = rl_vlc_table;\ - ff_init_2d_vlc_rl(&rl, static_size, flags);\ -} - -void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags); static inline int decode_dc(GetBitContext *gb, int component) { diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index e1f09b7ede..f636afe42d 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -43,6 +43,7 @@ #include "mpeg12.h" #include "mpeg12data.h" #include "mpeg12enc.h" +#include "mpeg12vlc.h" #include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideoenc.h" diff --git a/libavcodec/mpeg12enc.h b/libavcodec/mpeg12enc.h index fbbc43f891..0455e5e4e2 100644 --- a/libavcodec/mpeg12enc.h +++ b/libavcodec/mpeg12enc.h @@ -25,9 +25,6 @@ #include #include "mpegvideo.h" -#include "rl.h" - -void ff_mpeg1_init_uni_ac_vlc(const RLTable *rl, uint8_t *uni_ac_vlc_len); void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h index 70aca645cb..4fb19371f0 100644 --- a/libavcodec/mpeg12vlc.h +++ b/libavcodec/mpeg12vlc.h @@ -28,6 +28,7 @@ #ifndef AVCODEC_MPEG12VLC_H #define AVCODEC_MPEG12VLC_H +#include "rl.h" #include "vlc.h" #define DC_VLC_BITS 9 @@ -49,4 +50,18 @@ extern VLC ff_mv_vlc; void ff_mpeg12_init_vlcs(void); +#define INIT_2D_VLC_RL(rl, static_size, flags)\ +{\ + static RL_VLC_ELEM rl_vlc_table[static_size];\ + rl.rl_vlc[0] = rl_vlc_table;\ + ff_init_2d_vlc_rl(&rl, static_size, flags);\ +} + +extern RLTable ff_rl_mpeg1; +extern RLTable ff_rl_mpeg2; + +void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags); + +void ff_mpeg1_init_uni_ac_vlc(const RLTable *rl, uint8_t *uni_ac_vlc_len); + #endif /* AVCODEC_MPEG12VLC_H */ diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 11d3311794..6dbba02776 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -38,9 +38,9 @@ #include "idctdsp.h" #include "libavutil/thread.h" #include "mathops.h" -#include "mpeg12dec.h" #include "mpeg12data.h" #include "mpeg12vlc.h" +#include "rl.h" #define MAX_INDEX (64 - 1) diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 747ed679bd..4a009bd070 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -34,7 +34,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "mpeg12data.h" -#include "mpeg12enc.h" +#include "mpeg12vlc.h" #include "mpegvideo.h" #include "mpegvideoenc.h" #include "speedhqenc.h" From patchwork Fri Sep 30 02:18:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38473 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1399114pzh; Thu, 29 Sep 2022 19:19:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5AAZfVX19ETrFmzGU6hsXt+j4QReOpXlUOaREqjvMbAZRsM++TFWGK6Xkjyb5NuMDtlpIC X-Received: by 2002:a17:907:808:b0:730:54cc:b597 with SMTP id wv8-20020a170907080800b0073054ccb597mr4791029ejb.434.1664504345828; Thu, 29 Sep 2022 19:19:05 -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 n16-20020a1709067b5000b00718d0604af4si661793ejo.604.2022.09.29.19.19.05; Thu, 29 Sep 2022 19:19:05 -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=Sf15JENk; 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 CF8CC68BBA3; Fri, 30 Sep 2022 05:19:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065070.outbound.protection.outlook.com [40.92.65.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9AE468B3A2 for ; Fri, 30 Sep 2022 05:18:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lmPMFixu9XwXt0apsL9/4TsKj67BwKyREMyyxhsjJUF8O3/3WqW+8Z51pDE2tqeztbjhU0BUKpRv1EB0R2jX4BAJWhoZeN2QAzbPTYvfLnfopEJkjltODZWg+QVW8GFdLv/fxCu/hHTcNJqFRlbvmT6LtxLkakg/p0dZ33L0jnkkBhtKxL25nkRYA1lnbfwzxGOYcyVBAmW+7r+5NhSiLy0a0JBi64h7zG11d65onfjkXRErlCZF9G6zb/AAVh2hB/qPJb9QgWbxrIq1j6+LyC66UleN20AJyGHJg34/5kM83fJ8SAExoVhX9jkBon9nRIXW6LnwkvTzLQtCNfNHkg== 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=tAY/3mJsNenOJQbAcT175Wm2BlLV0jv5iSe7pRRet5E=; b=QkiYaTPDExShgOEBivc/k9JrgolAmCPSCat8aZvtEfNJl+11klehW7aV6LtT7GacbMmSLb39P9dJ3Z2XLzePw04L+m8mJkMGeGGCwDB+tPsI6yVTLgqeQN37h1p/Z0S+UQNkcdFN+t+iuACeJaH4sAyRb5yDUU5D0BLiSJLodhu8CG90jKFFdJMR2MSfRyrFAF5Wswi2Q615F++4mxuq0pHuXhOVHd0flGPfHbwovfi6auCH161gcqgk2XtsGJt2ZTo0iVK6XRuPAOswAQ0qFFIzqeQ9ZaS9GQCGsfV/x6HBJu0mcMGEPFIEJU8LJOelIYvUjVPMcSNGipPxd81ccw== 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=tAY/3mJsNenOJQbAcT175Wm2BlLV0jv5iSe7pRRet5E=; b=Sf15JENkYL8rZfYVsZmcYxvTdX+KyIDiTV/JEYpykiuUp9pbYVbyBrR3NSt+c2vwQi2FM6V/ydQSfPUIAhA33upmpQ5UbdX4raKcd6SuAynm4Z2Te/ubSf3N237hazGaKfgKmEaduIi7ZNPvT8HjII1f4hwolLqCTzfDVieFWRE+9tLzV/fa1ZdCBl7FlcQUD4/q6hPP7D4yIul4X7wH80aaemtnW/CvIYSewp/rJ2M57deD2TL9pHoF/j6m6FQU/L1V4+aPbP3OQoB2X91hmA8w10n3TihP4ApRxMT7AIbWh5igFdK0UdtlHN9kUumr/EbkwcmsvY7oofPS4LiVdA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0422.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:285::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 30 Sep 2022 02:18:55 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Fri, 30 Sep 2022 02:18:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 04:18:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [QOsxfpeEEZgVtb4uYtSAgQIiys5fKU+KihZar51xab0=] X-ClientProxiedBy: FR3P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930021854.3048208-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0422:EE_ X-MS-Office365-Filtering-Correlation-Id: a3655352-0278-44bc-b0cb-08daa28a1fbf X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmougXX/gXRJ/glWGV8cWqURwk7b1teqcg2XEvsf7Ekgxxu69gJn63u1uGRCYFdVxcjGTyjdrADFflkhT7fcHKOV4RFkpeJi3tnnQsKH3RCXHv/ROzcrbdMj1WQz3JfyTLVaPWqOUpN1VnBkkY6lEG5TDAOhgBRlSATNg7ZAJ/qBbhRUNsoBHNjC8lDQv2BCtca27h7Flp0hVBt7Eo5MBldn4z66dyWkDqroz7F0+oA0BB1KxC2Ke3/MAsaErkP1vPk+YSmTgsOmPZrJ0Bzch9eR2VQ88FQuT5Wl7j/CoH2SLs7qWITpPly556DZOw88xXdy2C6WKcbykGDDAU8ZCP+J9aohUfcrJzjSgPdTcGdaLU8BkpaLgtM4UYK4dLAZIRH7ARiwHEA003anB05iTIAE+1tdfE1GGpgUW8J1LJIJUYIDDAyNJjULInY1LVPnR20bq/yjk5XxefsZpfnsZ7ibaDUgxRumHYshi90vOcMyraX4fESlrlZ7DI2jDGORpW4qDSzymtseHwaU01l/dHWapylGlrn4qVj47ntvHtGtgRizOdQP7LaWG542x8yKj8OFuF0oKqnalvAXOQN24ubdU6rdEGYOgYLJfvwKkvLm7k1MLReCYdjIWUtfFSTwltNeu5x36nbBnCMY76AjdA08itm/seCXoVWzE0hBguEcM4bzeXPosbI/qcHVvDtreK9oGRglB6UwRYhjx6ZqBtMNQC+C1PuSWqvyN5yVRSsdD0nLffy3SebP+TbfSLWib80= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 42jotYcNQrHoYoJdLHc0ZM9AtFFtQV5UgcTI9rhfIGqYc0JoHH6pRy06cJFt39w9H2DOme7xGi+eZYdLLLpC/PE8UKqiva9kD9eFKY2i8oOefmSO8wywmM9pxvliOT5BWgscN/JG5bBg1Eu9hbByKhGp6VSHAPpsOYWcQAKSq9bKEYiUrlfPhajnU+Yop2iiK3j/Rh9QS3vBEud12aoJjBcVwc6Qud5JBfD412ZE355CbnY/6XdFYI2Lm6+sozywFR/2Z3qOkTnGrc0EZeG02jDPpLLbJu4sHxujtxFKyQJU1UJ4ievDl5554C5MBMmAy1aEzfDLok8MhWFSipCMiu7s8FSD5HQoKE0UB4d7Yf7zsEl+AqWyeX+JhXIZETm7VgWtFXDguALVApwq2bGle+G/VDeXVtZXL1hgmTVDaz87n8gKJENrQxF6Ir5C6YweHD5V1gSfS143CQTezb5oQlApUiyz503X8OMjMhk0k7jewskbDn3CKS7iywS4HAZB0+IbCReCCcXB03X7XEJqgpK2l+tUW6kZNrGu6bGJ3b2L14jqNs+y4deOmKUrV/CdTu6fgNRTXuB/rRjcyexgg+JlzF/Mln53KbNuT/RPkaQsBwCHCGgb5nBDZOGF9VU5qeRhDIAouBPx9NajHK1zQQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0C9DpJVmBe2q+XbxWxl8TYQ4dQwg5P3D0VMc/pOD5ZekH/9TFrbPhH5eQxTZrWYmVIKdfTRa7/sSB9gnvQs+QGls1uDcQchCSjLP8uvcUWoI1myOoCrGjfjlJ4YtVogWAnunIZ70w7D0r+FYlEDea937xirfvsfnqenBEladwQF03mjtl/Tn+Rff4eFXArZNKP4txcVSbV6Z+6SeInSY1dc0eNUoYrRv85CoinTSW4MPYrxDm1Z1waSeGRxZou6WAOWNNF4L7TIfdWGpku6Zv7X6txevOPiQ4KsCVbJk6B9W5jlsqyLgzusdEqV7tX49E+EzWMHMJrbtPtCJDTL+pqI/kCQZDkdgoasH5nyfAoT77ulTOiE81EZ7Y834qkf7KVOGouy1VTcrFTnNPKtHQsYnYgsuD6BrQRrqp+VTXKTpKn8VGBKiEp0vVYYKOvYv3yFVuJC+dCf+QJAdgB0VEuvdqlZcwNP36kAcOBrOuvZCy/v+mAmkyIs4nEWw0ZW+AbwjmZWSxhAzcZQikzNH2Zu2hrNnMIRgBFeJo731ivaKgeK5osuVFw7VRA2yvPKD1YeRPjt4I+o0cqae9rJGx/G7KurIvVi4ut4ER4iArW2JzyYk5kQecXiZ3jTpgz+sqqTz3TF+1z8vkLIAd7YFL02eky4UzelIMwE2+zzegebcziVKV1kVGAJQQn5mIjy1gv0K65qcxxHyZpy1a1Dt4F+mupWrei+AF5KOJhzPgTv8d6IWlew638X5zYJbA6Ab0bzgRtgxXQ6J5ZREPH99AjegyTwI0ViJqTeGyhhQOifgU/G3tMDY9hZiBXWIAxHehD6TKTGDK9vO9YBUwZbSH7MrnPB7PyjW1mgmf1FbiSR5LfInYf2wNif0KnTcu916o/jz+gwF40N52sI3F7aXl3q12Ui0hOrIpRif8WjvaL00evQWnMgP3d9Lrt5b4JS3cESsWfO7rQgaduNKw8lk2n364myzD+u18uIRJPdlRC8OQkO7XHpfpx9R8mxtLaC6kdbcUnOVrm6ySDoEWPFME02QyAehX3sJ65ivBuXip1BDX9FK5/IkxsJ/EhJqWtqaKoMxnE/c+UnPZhLwtzNwqS/zpkwI6fXZ/A99O/zmjuKwpiuApMirpay8yLkXfFOFG8DRLAGwGzA56HZxViyAjSBu6Z2YPc5gmkfdEMmdPtRQmkdOq/8FPRme0H9gHW8rmFRE641l3ZsOdcNt7rrhZu+XqTKtLz9fQ8HlAMdaCkh073qgro+pBZB3RJr5/0IqQh51n2p09Z4QXQ/X3ym3++Z7hSHPJpr7fAZh80h+E3GifIrMVlizMZaWb9iI3CaA X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3655352-0278-44bc-b0cb-08daa28a1fbf X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 02:18:55.0544 (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: PAXP250MB0422 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/mpeg12dec: Don't call ff_mpeg12_common_init() 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: mEqMJq3FCzuX It only sets [yc]_dc_scale_table and these tables are only read in ff_set_qscale(); but the MPEG-1/2 decoders don't call ff_set_qscale() at all. (Furthermore, given that intra_dc_precision is always zero for a decoder at this point, ff_mpeg12_common_init() actually set these pointers to what ff_mpv_common_defaults() already set them.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 7133696f3c..dad1970f6c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1062,7 +1062,6 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) /* we need some permutation to store matrices, * until the decoder sets the real permutation. */ ff_mpv_idct_init(s2); - ff_mpeg12_common_init(&s->mpeg_enc_ctx); ff_mpeg12_init_vlcs(); s2->chroma_format = 1; @@ -3075,7 +3074,6 @@ static av_cold int ipu_decode_init(AVCodecContext *avctx) ff_mpv_decode_init(m, avctx); ff_mpv_idct_init(m); - ff_mpeg12_common_init(m); ff_mpeg12_init_vlcs(); for (int i = 0; i < 64; i++) { From patchwork Fri Sep 30 02:18:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38474 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1399180pzh; Thu, 29 Sep 2022 19:19:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7JGsJMPKRQfr/0wbmbLuGKc5Et7FeyROxjOqNY8W/w1hSZGjGVoOU8ZjML0K82p5pMiGLH X-Received: by 2002:a17:907:a47:b0:780:6883:2a37 with SMTP id be7-20020a1709070a4700b0078068832a37mr4819807ejc.219.1664504358282; Thu, 29 Sep 2022 19:19: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 p35-20020a056402502300b004581364d014si1084552eda.380.2022.09.29.19.19.18; Thu, 29 Sep 2022 19:19: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=hnh7BSdj; 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 DBDF768BBAB; Fri, 30 Sep 2022 05:19:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065014.outbound.protection.outlook.com [40.92.65.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F212C68BA9B for ; Fri, 30 Sep 2022 05:19:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JRDJrlV3sqL3K2/MB0vLyxXB0pnmHAU5P6pRB9KvOdooN+d+KJtsgG4rCBEWFnn2S13juomGA49Jgv6ZlsJ1jbcQEOKc9CMnT+gKXz25hnrh559RuX0+B54M63vBIGuVBF1n5/nKKUucvlEE1ulzJl5O6xsxsUkuoMnmqFSIpvU0TpSoe3wSY9RKdloWdNcDCGarjdjCdb6+wfw6/puYKYDUkUCSgEcZyZgWIbzfKuYEbSC10pRStt8jxDs0jd9qeaAkxCQoqA0yC1ynO7vA9kvuM1H5E7uUTpCTOGQq3LTZFLHq2Ty/OlCmtMx0sunlFQ1ElN6hOnog1F1A0dI7/g== 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=g6Zdxi28a385PR/7Twkif7yxsOCmjg052gl0fwPzPJw=; b=iXSRR68hzK1f2kfVZ6NO3WKcjVykXIab5HVozLzuffb1e1L+54+v0JwgiddkWzknjdWxmI7mqGkA+tyZJ/nqD1Q48OdTIHWQ6nmgDVz+NuGH4WsqUgKbA//uqXcCehs7AsmNKEBgdW8LFdqdZN2Tec/ZEcfenhKeszDAU9k+y28QDG8420YNwJrl6XJ25YZuT1lxkE/SS+9rFcebNdIzUZNkneb3zCWI8YDFQy6RUCimBQlKq6taXkk+fjtjJea2haOyTfmblkt4if7cGkNUxB/PLW8LNk9DVUgodb6kTYYmsZfREop30wnpSpp8agW3d12zz53yKrL56sowbSAOcw== 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=g6Zdxi28a385PR/7Twkif7yxsOCmjg052gl0fwPzPJw=; b=hnh7BSdjS3qUXWCFnRB+NDGY6DEKycacQIOmufuE855JkfPU6TEhRR/Pn73gdohrjW1tsSvxArs84r0PXv/kh86DGkud6FcfVa4jsSr7AkrBucsvfcNnWdrAWtOtcgWJW+blYXVi8EJm4C63hN9QvTDZSyDFoskPWAqV9+cMpGVx45X7VbpDDjCfb+UWh4de23Kne6x6VKjodvpZKlDx32ehRIL/F0Mpbd3uiLkKpS6/A6ZEJdrTnkYyb/Es9AqU4qb+VIsAspOH8HSF3XhZ/AFXgH6X+NO5ogSSTCWYW1qcLsualxU8I8UvHZtIRsBVGa+aw0hUsa6K2F4YPJ9cGw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0422.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:285::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 30 Sep 2022 02:19:08 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Fri, 30 Sep 2022 02:19:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 04:18:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [K6ZM6U3xIUgM8X/aeQw/2crxd5R8MN5041QEk9pWCVc=] X-ClientProxiedBy: FR3P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930021854.3048208-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0422:EE_ X-MS-Office365-Filtering-Correlation-Id: 92ed224c-e450-4a5e-5064-08daa28a27cc X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmougXX/gXRJ/glWGV8cWqURuMfy2FVtIFV3rSdtHBzFg6aSLR939qYxf/QCsh9rGw+2Dvr6s4QzgDpaihm7m8oUahXpu+qmF0HXisVhOnDwzkAymjussRIecSDLbFjI9kucAItWwK5+VCSTwHXBwtVl0sTwTTT0Nod765VRcwtaU+gUVJTTfPm8q8D84it/fHRs0784TuT5DR1aWSJO3qG7R22rNQ+yCzXkEHq+aI7tqnaAOwWVKzI8RMd5cgrtirAd63KtJTetBiGku8JuD9mUW3jalaLFjcUVScoDnjLc1sN9DR4RL9pUHIq/BuM4FKt5sfik3JA6RN4/IfzEYVvkvTtkzOY9uQvFTgZ2FtLgu7kbiJXwc7C34NYO0J19Y3tdFNY799c0JSAiBpA8XJ3xC4MyKokHVeCnlNIaeG4yOBiAhR2Ac99awva112nktMNLMO/s64uHdR+Kb0MWFlXAX3+sbdnE84620kMDmb08JOy7AXPdaq+D4jqqsAO50PYvB8CKBc7wi5KHNcwjnMxg2LXGBWNyM35xpnDjxb5KwAE9UxkHYQEU4zCZo9veIVfjnNTNrFrN0oku0N60LCjo1+kJkER76/6Xdl8SL1hqxQLmJWF3OMvuneM1Y4Wl/KAh0ckUw2T9I0Z96qXzlqFzV4a0PzUHsYxVAQS/rFUtsJghFDYXGCH6xLvMAOiLStIA1Cg0tq3X0aofBP+UBlBx1NtDFWKZSJdSsO+jUp1hRVQNyylRfP9P4CUPPw1xHY8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qh61p325zA5uJNzFrlpUZyWEp80Uu6pCI/uR2g0mJardm1n6gbpwZCTikJyLvtj/G6gWtAGeNelYZ3I7LRN+GInGyXk00EsKrcFknzzbm1oNQAq31noRxuHtUw64rnfIIVqR5lqxg9keogq3gLzOD38tQWifG5r+6eQjkKPK0vDppUwZA2CMIJtmqka/iBJa/XO/46/9mJCcf7FUjAlwcut7HMpdgjGozdYO8Oh8sW83L/eSZ4YUM/PyPtTZoFyuIObiIvU42JS8bH8zqGdSt4XEhUg+XV0T0Qjw8TzFUo8rWD7svd1xiNhXu80qXt9X2Eojl/n58jxHQTTkvWgfxWWBYMIcJQPOQny1Zo/8Mqht/8YApTBhg95ZIzvhdDwwIQLRxxNXWfU3V5WdmIHJnwKUF7ewNgS2mAMH7W5a427mthV3yIq9Xr/vWRvf8+TBnRJxkcFSwbEzmuwOn4J4CKg+uF+U1B2K9kASSHB7L9d6MzmZDbpOn2T9PI5bgP6u//GoolQmxEtTzBfDSEkLXuYSDzlq7jjBTQYHufZg56UzM8fIjJln5e9Bh7Vihqnx+VR8P9WYFWN4MjJdBuYu2knUQ2BM7LtC9B0z6nTo7MtxGdbzylPQzBLuizkigM2JkaPoD2fPSAOddjMd5N/LZg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PgRod67+mciv87/H3pEv7XHzlqfmczW4PpX/GOq7oxYpr8R+DC2WPK7SGzoJvKU4Sea0DW/a3yE94k9cV/6XDGrpXlnGafB2dV6ISZosMlC8kIgwQRn7/5WH0QtzjVSfyYydCyvkLYSYGI2tPO4iL847g7hPEJdne0beCHO0BZrRQC4ORT9dSRVnGbWOvmBtbdLFH1Wnn91sl4ZTCJPC+h6pK+GeYWIiqe53fywFytTk3e6fg8pphJeBA61AXUT3GmGEGDR2wxG38H23iiW4xgiAwIaiOVNC3/y1xLd65p/Ee1bzIfiYRNMENIbx21Z0D14n19yYJi5+JQeu9iQ8ZGRDwpoEVaRuZcI2bRBPLVVsE7xk457Qe475KnciT6r7rDAZV5XhHfWHMql4/9H5Aud9k/73xWB1pnL8yUM4eZElmb35bArkQkgB8FN/EvdNh8xNoiUsGeNoy2FazpXOafroL3ZNXHwWkmrxf6L0EbuvIXGgS+qXMFX6ot4Oj2Pg9vDcIHenoCZWsgO0YCqShd1UP0IwDXaw1dlSffU1DX5K0jBmwaud97HM56/9jh1Pqdvt9W53h7/7hY0wlOKYtAo/aguhklg2+j5s9Zew9EWmuEwa9AMG4I6jJNYS/MimgkFSIwaD9FbqDOgbEwQ/0+BqjGrvJY3WF6PJL+lCda1Muz1CjBQB/teswLeV3+/jSS79ANe0MMZAGW3TlyuIeF/5H9iC3NSNso/j1kS0auWFS3KfJ+9gjZ8To6rZXeaLyfOVwZEQmkBpGnUwsGFPKT6+j1L8ySJT27CeuddVuHxmpqFsFKLH3JD9qPXVAq9SbJb7Nke8CS5jip+27LH804lLGGIXGWxmN6rI4fWAx/QkMmCQcyGUwFsVpWfYAkMWyH+kuDHHpbfn8KmP0ONqKfiuxVRf0qWKAVL3l/dt+ov2T7aL12jOLcNfPn4KE2p346sILpbnrITBPQylOBjujiSQhN1G+NLAK2LcCnbxXNt0nbTrsvE+84ejKYpEikbSCfxdGiXahNYT2EC32h8lNXmqCTzrEt0vylxeZ/Cbc8IqW5vY4SRc9lMONVlbxeBdV04gryZ8b35RFN2SmYZyMxzxl0K5Sf8ma7G8HEdRGqElojh6D6mPd+sONzutQ7ed5ACoFukkZK+n5jKCsOnrqTHrymnq3AjKdsIssjTDl+c/s0oFUTYuadrImBH2qkpd3RFCc6sidySlbF1LxdBV1uJ1swFmJCLB5MbHNcV9j4k9mq0L+Axe+lOcbPdFzmuq0s8f/IsxRZ8T6FE39qER6Pm5Lbtl5Wf8qm/ouFOz2oLHTDlB8zuHgFoyoE8TfSPT X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92ed224c-e450-4a5e-5064-08daa28a27cc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 02:19:08.4952 (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: PAXP250MB0422 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/mpeg12: Inline ff_mpeg12_common_init() into mpeg12enc.c 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: 6cEW5dUG8JFv Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12.c | 9 --------- libavcodec/mpeg12.h | 2 -- libavcodec/mpeg12enc.c | 4 +++- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index d78e25a777..7f2aaea7c0 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -36,7 +36,6 @@ #include "mpeg12.h" #include "mpeg12data.h" #include "mpeg12dec.h" -#include "mpegvideodata.h" #include "startcode.h" static const uint8_t table_mb_ptype[7][2] = { @@ -100,14 +99,6 @@ av_cold void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags) } } -av_cold void ff_mpeg12_common_init(MpegEncContext *s) -{ - - s->y_dc_scale_table = - s->c_dc_scale_table = ff_mpeg2_dc_scale_table[s->intra_dc_precision]; - -} - void ff_mpeg1_clean_buffers(MpegEncContext *s) { s->last_dc[0] = 1 << (7 + s->intra_dc_precision); diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index e0406b32d9..b323728a33 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -34,8 +34,6 @@ #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 -void ff_mpeg12_common_init(MpegEncContext *s); - void ff_mpeg1_clean_buffers(MpegEncContext *s); #if FF_API_FLAG_TRUNCATED int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s); diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index f636afe42d..01cfd1c1fa 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -46,6 +46,7 @@ #include "mpeg12vlc.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "mpegvideoenc.h" #include "profiles.h" @@ -1133,7 +1134,8 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) { static AVOnce init_static_once = AV_ONCE_INIT; - ff_mpeg12_common_init(s); + s->y_dc_scale_table = + s->c_dc_scale_table = ff_mpeg2_dc_scale_table[s->intra_dc_precision]; s->me.mv_penalty = mv_penalty; s->fcode_tab = fcode_tab; From patchwork Fri Sep 30 02:18:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38475 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1399205pzh; Thu, 29 Sep 2022 19:19:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5H57qyE+5MhoFb1ac0wWSN2Tv1AsJdIR61tX3TMPnI9TQgIu52R6GTagOXe5/a5vD7itVl X-Received: by 2002:a17:907:2e02:b0:77c:5020:b8ef with SMTP id ig2-20020a1709072e0200b0077c5020b8efmr4920744ejc.299.1664504366466; Thu, 29 Sep 2022 19:19: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 b10-20020a056402278a00b00457e49a94c3si1069054ede.111.2022.09.29.19.19.26; Thu, 29 Sep 2022 19:19: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=c81i2kEL; 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 06F6468BB3E; Fri, 30 Sep 2022 05:19:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065014.outbound.protection.outlook.com [40.92.65.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A01D68BB3E for ; Fri, 30 Sep 2022 05:19:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iXcenucYV6IWN7Qfqwl5WLH5GQyNptQB6uoAKcWcpFm+e2oF4X6yQpIouYB51OJxcl7R2oZaHswJEnqn8/HhJ3LHUaUFm0eAqvK79gvGcy52TjsapX4uh/6Xt8FGhYGeDz3NjNJ0+CgjZ9XAblgNMVAc9WpDGHygxuR3vR8/t/anvzu04IImMo3ci+snf6gosbaox4pK+RkG9kOhhmt6CptE+p+Jx+adwIJaAfFW52t+BmcLvAe45mWjCSLUPPn7K2AJ0GU0PJBgD8hYaYuK7ht0hON4rGOaT0tZ41te6+F7UE+8xIAdTp60OH0vfl8nLKyDwZl8JRAYgwvB1LjALg== 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=DrvX8vzk6PY4hf+xvvd1sz8NWpwVjmGUi7tLo/IKL04=; b=FcyAcJm7hW1SPvyYSHhA5IW+Bh94YXj+e3oasGItTcRwKu2PtkUs8YSXhv+lNBnR91byIHyPtLRt2qJ+qrMZ/HO8fjruYIaCk7X+SnKUdleJMd2EzBp532kNVnOzOxqQpRwtcXnGBy3NcxwFFcYnquT8rZ90serYyCsp1od6feXK0Vq+N0319dnRkjRF+9KZZDLKcjsAKYRiJr803lUFGBSq366e9Kp7i2P8riw/XG76FTkwvH6iY7A3ZGbBl2PGPiOzHzjO5TiedvKlf2yK0zRPjVejSDmAHnIUk/lLwwXH+7+ZDA30zESau39539SujjoANus6UQ3ESGy5LADCjA== 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=DrvX8vzk6PY4hf+xvvd1sz8NWpwVjmGUi7tLo/IKL04=; b=c81i2kELILg1qHNSA2KJphNQXreMhnkORfMC6B1GMS5d8JZgI8hy7mfAcBHFU2ZM5FI0RjFX5Y1J+xhRr54BSkeGUkLssUq3xEmssvFCci6Rx/auG3QrCerQyckoi/2NJi4wLMz0D3XJk4kgsdFqhywJckRq0KKRqgJX5h8XWKFaRIO2ScNBx76nx35tSoOqzP7llP8wDo+2QZ6Rc5VVpkLiDCNW4k0v9ZQTp2wy20iiLpPLCdPE7Y4c5Srxd1iwIsyebFrxzX42SHyBt1+Akru/sN72OwvfkEWkVqOBXo8/Jf3eYGNvdW/071JmJ3ykdTI6CoAxkpt6SQhRDAy5Bg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0422.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:285::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 30 Sep 2022 02:19:14 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Fri, 30 Sep 2022 02:19:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 04:18:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cIW5MBk6DXpVeQI5u96aVmyIHrdNiGQPqEcMFE28n1Q=] X-ClientProxiedBy: FR3P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930021854.3048208-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0422:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c106403-e244-4c49-3786-08daa28a2b48 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kNavzGOhNqqTDdvmovRmx3B6Fb6KX8uT2T8J6GbkbVYnT6J12WXg7ZsxynLqfOgHSSJiyHERGhfk+YhVCD5A0b2ZKtiXBoOXUmkOCEhEv8fFLN6Q+OX6P6cgQaD303uWdPGZe4ls1PS3FekS1jqAUpUjF4wECvT+/ezoFfHe/7/GQVSYStcxvOjrhRRaNSYr52NXWJDfu4ay8hZUzGARXcrOvl5MHSlYM6Oc9T4jd5YXcU7oJveN+dkqjxVsCRl3/gl3ZbsdNyFScVT+CdGbEB/mp87VCH18X0QfvPwpR7Ua65mLr1lkl0DbLYAXK2wqK9uHOMV9aKE6CUAHiy09YjT/aCX0kwc6VImcfkwFb4mMiaArFdfrW2LlAVrEazIcmj0vpn5NpraNsdZUxWKM2mBMze/4jg0E1AVEwvvC4LXT5gdJyAkquAZTcugvCUkGZKMWsyblKjibcgmvLLYPzPYAKlN35Eb4r3DwJbkVoJApYf+V4Ascx6fcdWx/tv/a+C9hpEsZb0lG8UBE5tUtAADK1KN/F0mf4DcfEnjX/vrlgqb0ZmpqeBvKgsciwvWWX1xVwolkvpOIf4C4rWKDRPfiiBbeZzpmeHDDACxdqUd9CHnQg9Cp9TY2p5tdUghkGmIUNkbVE0c6Rocuji9Nic2RSTvmbIuGvfA4swoSuh6cNzBIVwp/QG4ktCB8jz6crJQvexhoaYIqQXfN8FkhzGHB6x4matnKR38qctyBRbIEML65qbYisEq/xag0VygZhA5alf7JKP0CjN+2FvtRHQ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dl/x8k+j2PsPBcQWgi8VlWhcsHg/ffeVyGiUksLejnHwozbkmueX92tCv7V7dKiIAVc4bVpn5nkywPUwyKdok5I52LGWyeFVfGuvd5aJeyXi2LFqnMo0g7jefAePIB4QLDQicKSQnT1duVBRwt+JGte6EC4VHMJGhHw8qG/O0V/OOlhx6DW8q3RT/OdSAWg+CEy6H45BY2bVpgHsUQbIJAU5kiYFYJFngJgLLWDF4gSF5D0bmAiJMc2RyV7gk9sjXoQSSjQExh7PF22VTzaTmmF5x1yNuz1FhMPGZpMCbOYV47RAGPZuCYuFiYzXh6q9gfFgG4e4aiJkV4CwwW0QkxYfQA8+sPvqaM9EPJmz5j+4Bi9t3W2n3KLlPHyhaQL4Zo6pzrPTcTZaJvZZcwphPhTK4pSgDRtZq7Pgd9IgoLSVrMxkkL3pFJUB3EiFxmVvna9EQzEBHgEXKiD576roo1FP9Si9ou585Yn72sErEWKEzyLLtZQjUEPOlipA8isKGgnhwWGleerdI1RM2GGZoNmYvYE0HHaKfFYYFO4aRWk9L7zMOokaRUOpM4DCrD1n3jg6o6fJEQURtURJ1/fMRqZANibwqPuIq8T8zGl6k60o/vRdSbQqQs4tYgXtuf2/pSlV76usXgxGm0SBxHgHeQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z9TgAKV7J6HKc2jpJ5urZGj44dSZOKS44qRoag5D/UM4bSdxUKHztUkjzDNbka3w5sW8AY+FykPeOUuPZhwc7qlOrm0p/Stt9froS2CvJTJb+BZdTXoMeiSmQWu3Sn6qb2gaXpsbTVVm/3xkEPGw1iynC6dQhsxBDbsP2WDtwb8LaRPL/qqfzkpVw3qvXVNbEr4EneU+E9HR/+AO2/F2fH2zXj/25JFYCcOMAeY7zKJXSryGXq/uCHOUOesGYZxyUzfnkXbgg5VpM6dWZUepF5s4OKndXqMgMwOvrBL+OQRAPFLf3M2s+Egwy1BF3gLICqsdq+rID214PXQRd2QNIM9PWl25dFmj74PzpjZZ6kfeGcALAJAuJrehrxgs8JAKxEFrbXnmR+e/oxmX3rtX9vSLWRmFXBCgu46r2p5TUy2mhz3dLGYwyZhmoJS+nr6WUJ1tN8WPdM/8E82dPWF+ZakjCM10IgHfIQez+1VXFtL+VHIL7hBtmEoX/6ICfYQVKv2oPOMgBrZIbfwLfB6RT6IDrUJwiftyKF3eeIAI+bbBEiOqoAJtAGN4ijYCXNxQXWOofWDtY0mZCD6gmuzveS7v9PUxGflg9k8LhzLTrzNA9XBL54+N3VMGeGJMLSx3KM5Go355Sp7l+DZYbThXZ9wkWkzhgItMAEtIBNtN6vWoF9Thpopz4483YYdQ8tMfOMCfk61FJi+H00HhUw3D8Q/bZfADJqEpv523ppRhzlSjb+8A5zbWyDQjXgnALwBPPH9Krk1IQOHToOMsVkcUkQo5J+5O6y/sJGchq+OJBFgl+cH2qG675Sfbknv/OHCr8NH8P9iQn8Go4AfI8uoA6QuljD/4AIdTDaHzP1Kubf6TGsK2+I50p+V/3VUH6n1Tl4xtLXM6Ku2IkSqA/pg+JFocaYIyrvdq0+qgOHoZ4c20kpUY+RTd7rih0BHFHL/wIuMDtA2PNbIPxKryoBIM8fOE9jDe/qWRETZkFq4WgRw0IO8CbS+XLD8q1tgUN/5GSHgz4SNBIO51Ve6ZXew7zAlFQdYxjJ2Wz+asLjvchlenFcQ0phyNaNUbXNuu/S/+r2cXed7Pa14J5QIofgrmaQQsUtBkdR4YsT415cpWkkwVt09W7Qf8gPf4mx1RlVmg/0bmLSuEj0nXqB2gp/gGpHCsS2kSgZfzpUpJm6wnXXdiDIwqrIdaml3hWPmI48Dh2lP5x60DKG+JNVt3SVI5fd9TkfKfxVMdzc7Umja+KuE3020TL04jPgLsdbRBkaiC30D/q/bdWP9DcqjWl24jvhbLyWMLtIGEjtCRIzcSpbhUq28EYjzz0RQ2cdEcfW0W X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c106403-e244-4c49-3786-08daa28a2b48 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 02:19:14.3404 (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: PAXP250MB0422 Subject: [FFmpeg-devel] [PATCH 4/5] configure, avcodec/Makefile: Remove obsolete mpegvideo dependencies 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: MTWCZVENBBUv As long as ff_mpeg12_common_init() existed in mpeg12.c, it added a dependency of mpeg12.o on mpegvideodata.o (which provides ff_mpeg2_dc_scale_table, which is used in ff_mpeg12_common_init()). mpegvideodata.o is normally provided by the mpegvideo subsystem and therefore several codecs and the MPEG-1/2 parser added a configure dependency on said subsystem (additionally, the eatqi decoder just added a Makefile dependency on mpegvideodata.o). Given that ff_mpeg12_common_init() is no more, these dependencies can be removed. Signed-off-by: Andreas Rheinhardt --- configure | 7 +++---- libavcodec/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 6712d045d9..28d5b0cabe 100755 --- a/configure +++ b/configure @@ -2819,7 +2819,7 @@ dxa_decoder_deps="zlib" dxv_decoder_select="lzf texturedsp" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" -eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp mpegvideo" +eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp" eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp" exr_decoder_deps="zlib" @@ -2873,7 +2873,7 @@ ljpeg_encoder_select="idctdsp jpegtables" lscr_decoder_select="inflate_wrapper" magicyuv_decoder_select="llviddsp" magicyuv_encoder_select="llvidencdsp" -mdec_decoder_select="blockdsp bswapdsp idctdsp mpegvideo" +mdec_decoder_select="blockdsp bswapdsp idctdsp" metasound_decoder_select="lsp mdct sinewin" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables" @@ -2951,7 +2951,7 @@ sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" sonic_ls_encoder_select="golomb rangecoder" sp5x_decoder_select="mjpeg_decoder" -speedhq_decoder_select="mpegvideo" +speedhq_decoder_select="blockdsp idctdsp" speedhq_encoder_select="mpegvideoenc" srgc_decoder_select="inflate_wrapper" svq1_decoder_select="hpeldsp" @@ -3275,7 +3275,6 @@ av1_parser_select="cbs_av1" h264_parser_select="atsc_a53 golomb h264dsp h264parse" hevc_parser_select="hevcparse" mpegaudio_parser_select="mpegaudioheader" -mpegvideo_parser_select="mpegvideo" mpeg4video_parser_select="h263dsp mpegvideodec qpeldsp" vc1_parser_select="vc1dsp" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 14434dc06c..8022e9a5e7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -332,7 +332,7 @@ OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o \ - mpeg12data.o mpegvideodata.o + mpeg12data.o OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o @@ -659,7 +659,7 @@ OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_SONIC_DECODER) += sonic.o OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o OBJS-$(CONFIG_SONIC_LS_ENCODER) += sonic.o -OBJS-$(CONFIG_SPEEDHQ_DECODER) += speedhq.o mpeg12.o mpeg12data.o simple_idct.o +OBJS-$(CONFIG_SPEEDHQ_DECODER) += speedhq.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_SPEEDHQ_ENCODER) += speedhq.o mpeg12data.o mpeg12enc.o speedhqenc.o OBJS-$(CONFIG_SPEEX_DECODER) += speexdec.o OBJS-$(CONFIG_SP5X_DECODER) += sp5xdec.o From patchwork Fri Sep 30 02:18:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38476 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1399238pzh; Thu, 29 Sep 2022 19:19:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM45lTzRjTWgQ3dN8MPI1L+18ytGpw5NOxQlG6eyYIYWcDg0mcZT30Zl0OOTuTqIhY4CiS66 X-Received: by 2002:aa7:de9a:0:b0:44d:8191:44c5 with SMTP id j26-20020aa7de9a000000b0044d819144c5mr5971758edv.232.1664504375542; Thu, 29 Sep 2022 19:19: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 qf12-20020a1709077f0c00b0078334ccc570si798908ejc.328.2022.09.29.19.19.34; Thu, 29 Sep 2022 19:19: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=XYsCiSNC; 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 C924E68BBB2; Fri, 30 Sep 2022 05:19:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065014.outbound.protection.outlook.com [40.92.65.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AA9868BB3E for ; Fri, 30 Sep 2022 05:19:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f0HVPZXvz936v6N6jiiXmVsM+4jHdjqjeVfW6aDXxdiY94w3NS1guhIm0QXCVW8usspX5Pxoryk/Tf7qLKDMKucBYcRMkGUdZ8dJJSy/gzmbP8EuJ235BNqpmeUB/DlnIDzqZ+jLBD5Ns83u4UOvaqq44fJzVgEnObIzD+bRKDoc4Kk0R/nDp9b36wk6fJpjroTIya4yvYN2q4+Y5453JinIli2JHrkV4fcgYT576wDlB3K05WHSD3IHV3q7yaZZ4LUgDV0/cDpjFT26gBEcSGcl+APMJGFG9Mmtm5VwKKFmo0eHcwg3/JMbLriERF3D22hZvvW1EZRloUJdUxR08A== 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=SSAKyzqlm5Y+ktaoBWwMlSfxrQiQaSD/Ui4wFB0l784=; b=TilGfO3kG1dk7YUT+tVDa/BH+igVXJIl66Ng+uHnvm87eoAp9T+jFg7W0RUDSCNhrcSB/o8OtPxgy6YflS4mvZhffwWB8I3skadn44/+5TRYHGvZ9EijJophD8lzaIlRkG0tIfWUm5dmHJlLvaHU5VhX9S1aRPwvcRR2q45bbh7/dMGtsqIvxLpQvL3Q4CrgVjDxQu8xV+Mc4CW2dtbGk3XxmXg0VicoAug3RoKXUwUekgyZIjy/CszDjltJurMJKpDJuqe42cccT8hJvQWCmorYxS7isVfneqO1FHyQ9bSrIaZssSobjkJRAK62pFHyXLz0+9P4xun2+jpNI+CvnQ== 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=SSAKyzqlm5Y+ktaoBWwMlSfxrQiQaSD/Ui4wFB0l784=; b=XYsCiSNCa0vZVs+WEN3Eq91kncdzwRDjebo4bvUmDhzpUlf4ltnUMX53EXmcUHQ6SJOn/x3jIjXA9y78lUjyOD8gL3iDQeipMg3hRGGj17jr9rs5sVaUVgmGupXPXSC5ks9uUPIbu1uoz2/0T9ClyOkUG+kfpZLzccNgigPYayxRPEMyRDpJswQNo9t2kT5g2YEk0SjSguhsR44BaCzF5e28AcclUqwdBlZR7NhLxsF6U/X4kJ4rEKTuPhv/U4JcR/eKeFjpE5697EgCTZL9cRpQSCVWd+xrpKxTIdDDstfWUK5YvLXpjzf9vTg7cVPMjuEsjl84bPYGnf0w2zk+Aw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0422.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:285::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 30 Sep 2022 02:19:16 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Fri, 30 Sep 2022 02:19:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 04:18:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KF+UOimiSORorGEnOB++h0oYb1YamGLYLD+bmteohKk=] X-ClientProxiedBy: FR3P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930021854.3048208-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0422:EE_ X-MS-Office365-Filtering-Correlation-Id: aacce807-ae9e-4d68-b77d-08daa28a2c42 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyb/VeDmXQSdjhJ6c8u8nN+S6bjTChwGquv2nr3frKaNU4/qOoVcsyBK6vRZxFsgSdZczfk0fqVwfBIWVLFvIjrjizhgbRzT/Nuc141ksd7d+4sp0GTc4LXrQrx5RDusTQ2j0hyfodVQTvpY9N0ys2Ks0ap22ouXr1KbUbfFa+AZ40wVs9jkjRHJU8BQz57ptDLPTS5EtTIYUm7rX/QBI72XPykmzJuKD6MbcyABG9SZqN7gT/HYi+KqiCyqIv7GWUC51t2u5LmNVvdFxDI5t4GOAATi8lVGwlFbCHSouiqkasEktwC9RoL8QjflqfTUXO0EekohZhLCbTfma8Wvev8iIiAu4UpLgf18u7DeWeelV/AOOMxQ9KmlKjB3bwQowVHvfZV3U4Hx6Bgp3tS8OXeiQrHJKTy6yNkDRaZkpm/e9agUNwQPyhjJ2JU/T/MqbT+wcMQ2H3/oDdW8FD/jSmjMVcoBEnIVWXKxtbpQzD7MC1oO6L4BVErpmBpZ6SogO2MlgYDY6dOMXFWkIZFmTtDoCinvEyEgF6baM7RxmQo1gv63ZEH2FEekt7MEsmgQzDM4VcpWulTdBZsFny246uhAOf2seJCDRCslZsReWlYwp+NyAK4m1o3P4kUOUlTnx45FTcL35t7BKRwj+Nqcez9XlaVHaqq1We8nZp2ZD56HczZyhzmR3JNP9e6hg8NWDfHXrKJ18IDq6xVQZwrjuAvCNe3rQmz4Yk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mMWO5sjn7Gsoni3YPm3pkVwCnQJWlfKdUc5HyMAsbLpB6UIzpSvmjwIs5KPQnVeyHcnpZU3HVAsswQM5S+4+l3RETjhbgyIMgtWVBoSGS007yWlHehghvQmIrTbUxA8QoN4fDU95v9IEbeQW6vz8svtE3A71U2cIcjf91QfEotWc8eqPKZl8fNGzIesr/7eKocwBnzqTNXSvOXSuFFt14pCXupKjmwajRNCdh94ihivLqY1BWA0CnTUjAJaUFlouJ0lhz+vPCkihi3Rf+zgHajxEUht2+xcceehtCg2n4Rah59aESdk3IhjRSEuo+bxGHfz5fjD/fkl5SadFtuwysC/1ftI1qekp+96+PXxysfVSv6Mj8ORL6YGswFRBBmay4dXsLEzpEvdOl1QTWY04S+XxGmbNOlAshqEeajUI9ciECZJJXVeU3rLmPr0Oj1w/3vpf4mdTUiuxwnALQhKEOELo1CwpFXSU2AFejF0OvSHQOBe6ltyi7tpM11ek08ZMkJuHP768COMz8np2jiUY65DVctzaJymb6LJ29G0nKYOQoc1oRBvsh+9a4BkoYejcxfOvp4BkKBZsigfiQNUXgKbOewA27pj68MnNm9W0BTDJ5ueQIbTgKera4B/3jQ7nr+Jndv5GFUV+Xc0GkIcCug== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +BbYyLH48aNkpRmvWGyJuPQXidAPaeH4TqZtyGm+rM60NOcVJAKNDF3h1lBmF4PmcTfw22XxVltyDEi/AAMfZ7kfGCEG7gavn6k3EB+kswS3+vRa+RwffWHyXAPHVkD4HNNkOod9Y0ozysr1cZjuxozK1J48DFVn364/Z6+UdqalCatAu9DjrlFaOXYAkFTx3TPcJC7xH9cT/Enfo4nDHys+h/Yyo7muYgVZAkwxUzEi6TqJfK72hldfasHSmrGExcWr4tGLPl/hjPsG3Y+bsp7hAlQ9tSWku3pbYg4e28u9Hkgua2AyB4HvFWLZ4vRTumSy1ZLy1Ur0P9h3+CSkNBKPgRvZFplVYTkcY3pJmaHAWqGgE3UewG/w7xPIUvAoHinSPARsvQEZV5ihCqtb1D3q6RH+/7f4lwldOVWF315io1yJH0w8Kw+KgEgBNsZVGCdPSZk1vP6YeGH7qc5i6/cNwJ7srjMZrF1u3vX2ewz9Ih8KJZPwLeJA0DZSBDryesIYmfqkyQbGKRtjTFX4WcWKe5APjez0+klV5l58+L1/7Y/PokYUfTtMUymLF+VgLK/rd3TODcuqpKGdnT+nz7TxhlotiQbjdQi+LG/l5uomKNFBbrVgKntZjMss4F+Vp6K9i7titNu1atsRPSy0CFYvlqvFu1rp8b4k9NYFnq8isHcN/byZ7GmK1uAFRwjzYx/rsYqXt/0SUz9INvBo2eTRQ6pksq/gUyclWPSe0I4DiWD1deMtss5Pi5m2UV2s2Vl2QDGfQIKyKEH3MpOClGEI4WMNrXrMhwAzbCoFqtsVxuEeLY+l3b3f8VmkyfLgzwMqFyYivy7FFers+Z+4AOrf/gOGN54VJBrSYvnM0GXRtTfeQPJ1BpdOnMgmG4XR9H/d6rkaJFGam0zGdLhFYoZCT+RHA0+pVORsa8NIszENlpcrIh/Ox5TpO1maKGoCS+P3NaeVT2zYG90Qb2sbXPAGcT3fGeaVZ3xFLK5Xm1H4P8ECdafzBzmFMKnPIcO8Ke+xzSRFdkUpNwXSc7HwlGjPhu5Q6aeD2SuZI5JwRV3bJJONPftBljlZmITHMXLrxNAMeu8lqV9LKWBX9UyB/WCJpOSiExqApN8TUBKmZfYtvanNMqHIPWRr4Xk0/A6uBJJ7U/VEFqq5TsIY5lfI+9NeOtv+vsZ5/yc7m5ndw/ZhvjNVWHc6yzV1lk8tHO8VH/W2f/qoo66prQrS3xuvg41xUj+pIev6Bq/WDg0SHXAFD5Zzs3/tzxJ89SyFmQriEdz2phGWyGL4PPChsGGGcFwIfK9DUZfTAmYtu8ruzkw9dEIol2Hf8Qby7jvsEK3d X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aacce807-ae9e-4d68-b77d-08daa28a2c42 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 02:19:15.9820 (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: PAXP250MB0422 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/mpeg12: Move ff_mpeg1_clean_buffers decl to a new header 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: 9oZ+vFeZRzBq It allows to avoid including mpegvideo.h when including mpeg12.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12.c | 1 + libavcodec/mpeg12.h | 10 +++++++--- libavcodec/mpeg12codecs.h | 29 +++++++++++++++++++++++++++++ libavcodec/mpeg12dec.c | 1 + libavcodec/mpegvideo_enc.c | 2 +- libavcodec/tests/mpeg12framerate.c | 3 +++ 6 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 libavcodec/mpeg12codecs.h diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 7f2aaea7c0..df6aba9d74 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -34,6 +34,7 @@ #include "avcodec.h" #include "mpegvideo.h" #include "mpeg12.h" +#include "mpeg12codecs.h" #include "mpeg12data.h" #include "mpeg12dec.h" #include "startcode.h" diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index b323728a33..4e2e67eae1 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_MPEG12_H #define AVCODEC_MPEG12_H -#include "mpegvideo.h" +#include "libavutil/rational.h" /* Start codes. */ #define SEQ_END_CODE 0x000001b7 @@ -34,9 +34,13 @@ #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 -void ff_mpeg1_clean_buffers(MpegEncContext *s); +#include "version_major.h" #if FF_API_FLAG_TRUNCATED -int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s); +#include + +struct ParseContext; +struct AVCodecParserContext; +int ff_mpeg1_find_frame_end(struct ParseContext *pc, const uint8_t *buf, int buf_size, struct AVCodecParserContext *s); #endif void ff_mpeg12_find_best_frame_rate(AVRational frame_rate, diff --git a/libavcodec/mpeg12codecs.h b/libavcodec/mpeg12codecs.h new file mode 100644 index 0000000000..f8cf5503e2 --- /dev/null +++ b/libavcodec/mpeg12codecs.h @@ -0,0 +1,29 @@ +/* + * MPEG-1/2 codecs common code + * Copyright (c) 2007 Aurelien Jacobs + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_MPEG12CODECS_H +#define AVCODEC_MPEG12CODECS_H + +#include "mpegvideo.h" + +void ff_mpeg1_clean_buffers(MpegEncContext *s); + +#endif /* AVCODEC_MPEG12CODECS_H */ diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index dad1970f6c..df76a90c6c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -47,6 +47,7 @@ #include "internal.h" #include "mpeg_er.h" #include "mpeg12.h" +#include "mpeg12codecs.h" #include "mpeg12data.h" #include "mpeg12dec.h" #include "mpegutils.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0b398c56ab..06c3ff4cbe 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -46,7 +46,7 @@ #include "dct.h" #include "encode.h" #include "idctdsp.h" -#include "mpeg12.h" +#include "mpeg12codecs.h" #include "mpeg12data.h" #include "mpeg12enc.h" #include "mpegvideo.h" diff --git a/libavcodec/tests/mpeg12framerate.c b/libavcodec/tests/mpeg12framerate.c index 595bdb278a..f2d3e2472c 100644 --- a/libavcodec/tests/mpeg12framerate.c +++ b/libavcodec/tests/mpeg12framerate.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + +#include "libavutil/log.h" #include "libavcodec/mpeg12.h" #include "libavcodec/mpeg12data.h"