From patchwork Tue Feb 1 13:06:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp604863iov; Tue, 1 Feb 2022 05:12:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSPSdsIHGd8ZfXYoK9wr75JSdZW9cOTIk8tA4kr1FKK32cqF6RSblrray0hvxtnLF6qcJu X-Received: by 2002:a05:6402:1007:: with SMTP id c7mr3625221edu.424.1643721160149; Tue, 01 Feb 2022 05:12:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c20si8746256ejj.420.2022.02.01.05.12.39; Tue, 01 Feb 2022 05:12:40 -0800 (PST) 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=Qp3PAOJJ; 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 DF8D568B347; Tue, 1 Feb 2022 15:07:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2084.outbound.protection.outlook.com [40.92.89.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 451C368B33A for ; Tue, 1 Feb 2022 15:07:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gyPPwz878bxW/Rtzj+jlTczUOuvBePk0e+i0cjYooyl03PAt3XVI0Z1YJmNBd7MS1atM5rkXmq0kOzM6jGETtdQy9H+FolbPg4aEJhNPdL7OujD2bRm7zX/On7+1FyJyj3kqSVHze/sob5Y+i+yPrr5nm8CFjsrFx9+2ma3QpYtXDVNHwq44ujiA7cbhWpSvbXqgazjsgKtsbjOk9WghmtD2AHyoZjwNSwSbewuiGV4CztkgB6F5chJHGk4b3AGlp+RAAp9niitp6uX8CTfyqakhuVi3dPGDUByJ59qWQUjEVNdZxh1ny87DyfXdwQWn7mO+bxCSwtQBU0g4xF78bA== 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=rJrOUxlBqTEGAKw6qSUrNppk1O8eJKTEOzsHTyNvaB4=; b=D5GFVspHDrvapo+nvlN1aygF7jnoUGfg5VbdC1OckWyNRwlIJRHXq0HkD5/0FUfteGXpBa7pPEKf1uCY7O4eE0oZcl9LkXZPoSP0jfWHaov/ProbJipISyanjxB2jkjvmvlYUFN4yseBrRDX1oJx2H9KyI3u/K0T7NzW8RoWPX2HnfV9Je5qzegGkmBwXUm7RvJJ3WdOCn58DviF8cgafOERKZYevY/auIEavAjHY8j0AR01+bD5qCQlVpFvhzPNOHVS31jNINubTALrdxo48f/AHHY7wa/iqqRg9/foM8CgEWsmIUxfBooSVX8nHkakLq09NjAevMYkP36ecsPG6w== 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=rJrOUxlBqTEGAKw6qSUrNppk1O8eJKTEOzsHTyNvaB4=; b=Qp3PAOJJcp0239Y9V2Fox5YKwSFT9VEmynDPy8vt/x3CvRZS6d+2EiEa16i6ONpjI4WAMtbx8CG+ZD8ac1dWRVnq/Yzp0f0y4SDE6a6/dDOprecBhAFL0UlhdWbNz26aj5XZgetnZk2qEGj3C4+x0uGAAcbeyJmbu7E1owxLxwREboECfgnQv5D4EcfGROJ3dhHQsonoMoD1M7R00mWHpmulIf0v1MPNGo95ssWzviAT5jhAnvLNycmW0rDK/kSpl3ovruEdmBu2DQKMYChY2N7QAWYn/lFGamlGNjcZ8hia00PBkTBbTEsJI22sKyzQFjFmNmyC3mck93Vk5lh5wA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB5700.eurprd03.prod.outlook.com (2603:10a6:208:16f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:07:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Tue, 1 Feb 2022 13:07:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:21 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VkEcLv2AuCPvoELnEflaw4rEqcHqCfIy] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6f9c835-f7ee-41b5-e195-08d9e583d95b X-MS-TrafficTypeDiagnostic: AM0PR03MB5700:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fHntpsLPWMnqd/FvkFEOpd2Ts+2COowLjUytlOsI38sQCRk+A1V0y8WgzmaOoHLtRecYNtgkp41WRzMTL+CDkNRQ326drsGd6jMztiw3H6f/WxxFVjn+4M0l/+C+Z03Js/j8RvklWwHl261viGGluCAe9pGrbdiLzmC9wPnkA8cCDjzoKvM1kuSsgqM+Vr1prZdPO6osesAz0pUMctux8cFEAyoarlTbHw32UXaejEeekQfATNluESAL4ZKY3iPoG4fQjV/Xg4yDOt+XFv5vcTyzsGb1vS5cO+q3invWZuyUvxcmZr8boCI5PHOl0Hb7LqfOLRrfvB5BsN6Y6LIEcn6X+2Q+I2weMG698prJH0TeYRi+vgETvM1xOTfTE/CT3P0uUXn4G+FbukbcOx55z55fzhZgVjtr7Tx8If8iqYLIBLeynwJxu3Au2r02fAesEz7A055wCVVOoobTLDtEOrTpo1Xd1lZj5jTZ82MwcFNOX0rLP0hFHrmSro2uysYchklMKEnMy0PawIZOvnKABwaR8RZPcW/2hfNpTWz73IEjEDJdgraoQ0414ijK79S9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NVyZOGVmFCYD90iJknCIIyHT2uxFLonptnJKU0uIc33l4RHeNmiIlP9f15imsaz0l4rnZO5KxS/URSNFP3+vBVyk3Kunb/hhBLypJPCjuvCZ1xPv/HmZWoLkaHzZjuqLGVc32jt8ol53aVEhL7n/L4mGnBSVyW5ocgBZbk6XVHTgsIAU78hiIDy1fkyl1g3Eqkfj3H8R65VxYTN5tdoTxUa1eHQYQ55Niwfp3xHiZ7WEXe6Y739/VRGZypDufXgjFwbvXkePrJ4HGIe1iQ7zXmLr17bWtSCytFDcpYMuCLsnTzJlUUs0FHyfngikS2FPlgLNL1lm2Ni2idC31Sh++YiFqtyUZ5JOB87IMFj98eYJK++HszDgAk57IQi5maXdWea1+ezdyBYve0LJ1l8on8NC+SNEUW3FRFkhaVg15LGRCjvBHCLnfvck9iFDXHxDS6BcZAnf02KS/VIFAdidAW7fF+SnEo6MsEI2+pfoDp0Nbz5192sYzuT8vn6+9OCiB59kZBNdJs1cIn5Xr5qufKYz+MO5NCYsrsbU0grPdTQT8tOvTmfWXftzDa1uroBVDDKpfNaCGBZKYGhVA6Fr3Zge2PgIfyNIQlawG4vTmVxNYNxGXGO2LKzvoK3gHjJub4TtY5bzvnYEcNId09vezwjNfAUD09qtYIwzpVodNNYfU/BG/DpL6uxKlN6YUNWIZ0IJQOGrLhUnffTmVkHBR91cew2i4H5WHjn4fcsVFemgJEfLU1/xO1wPMyAZ2V1A+S6qXyK5IB6ReoN3bzGlz+zPEIBVpLGLgBy7c0d6/3zUHHrbVG3LzMs3KiGD4O53/LZadt62+lH8f0qPCFk6Apx2q8rOBPoaxT4N9p9hEnYTTyCNvI+20jA39VY5cGdvMWr92JSEp09kfvcPlHofZFRa7mFOufpow0z1nU0lHQW/tUf6m4RbrRLCgGjEx8CmOp0QVb2jMI7bJlDBdcSoyg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6f9c835-f7ee-41b5-e195-08d9e583d95b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:07:50.0570 (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: AM0PR03MB5700 Subject: [FFmpeg-devel] [PATCH v2 24/69] avcodec/mpegvideo: Move decoder-only stuff 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: UUw+xKXFmUTQ Signed-off-by: Andreas Rheinhardt --- libavcodec/dxva2_vc1.c | 1 + libavcodec/h261dec.c | 1 + libavcodec/h263dec.c | 1 + libavcodec/mpeg12dec.c | 1 + libavcodec/mpeg4videodec.c | 1 + libavcodec/mpegvideo.h | 28 ---------------- libavcodec/mpegvideo_dec.c | 1 + libavcodec/mpegvideodec.h | 67 ++++++++++++++++++++++++++++++++++++++ libavcodec/mss2.c | 1 + libavcodec/rv10.c | 1 + libavcodec/rv30.c | 1 + libavcodec/rv34.c | 1 + libavcodec/rv40.c | 1 + libavcodec/vaapi_mpeg2.c | 1 + libavcodec/vaapi_mpeg4.c | 1 + libavcodec/vaapi_vc1.c | 1 + libavcodec/vc1_block.c | 1 + libavcodec/vc1dec.c | 1 + libavcodec/vdpau.c | 1 + 19 files changed, 84 insertions(+), 28 deletions(-) create mode 100644 libavcodec/mpegvideodec.h diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index f08ac8b5a0..5fd6957d0c 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -22,6 +22,7 @@ #include "dxva2_internal.h" #include "mpegutils.h" +#include "mpegvideodec.h" #include "vc1.h" #include "vc1data.h" diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 17f1067b15..5e732b05bf 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -31,6 +31,7 @@ #include "mpeg_er.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "h261.h" #include "internal.h" diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index bf2e9b1583..df9ac2f831 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -47,6 +47,7 @@ #endif #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "msmpeg4dec.h" #include "qpeldsp.h" #include "thread.h" diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index d55a4d2feb..a3a7e86ccf 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -47,6 +47,7 @@ #include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodata.h" +#include "mpegvideodec.h" #include "profiles.h" #include "thread.h" #include "xvmc_internal.h" diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index a437f233ec..6d7f7f66f9 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -33,6 +33,7 @@ #include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodata.h" +#include "mpegvideodec.h" #include "mpeg4video.h" #include "mpeg4videodata.h" #include "mpeg4videodec.h" diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index e16f850f30..c4ac7bc966 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -44,7 +44,6 @@ #include "mpegpicture.h" #include "mpegvideodsp.h" #include "mpegvideoencdsp.h" -#include "mpegvideodata.h" #include "pixblockdsp.h" #include "put_bits.h" #include "ratecontrol.h" @@ -586,31 +585,13 @@ int ff_mpv_init_context_frame(MpegEncContext *s); */ void ff_mpv_free_context_frame(MpegEncContext *s); -int ff_mpv_common_frame_size_change(MpegEncContext *s); void ff_mpv_common_end(MpegEncContext *s); -/** - * Initialize the given MpegEncContext for decoding. - * the changed fields will not depend upon - * the prior state of the MpegEncContext. - */ -void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx); void ff_mpv_reconstruct_mb(MpegEncContext *s, int16_t block[12][64]); -void ff_mpv_report_decode_progress(MpegEncContext *s); - -int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx); -void ff_mpv_frame_end(MpegEncContext *s); void ff_clean_intra_table_entries(MpegEncContext *s); -void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h); -void ff_mpeg_flush(AVCodecContext *avctx); - -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); int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src); -int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src); void ff_set_qscale(MpegEncContext * s, int qscale); void ff_mpv_idct_init(MpegEncContext *s); @@ -638,13 +619,4 @@ static inline void ff_update_block_index(MpegEncContext *s){ s->dest[2]+= (2 >> s->chroma_x_shift) * block_size; } -static inline int mpeg_get_qscale(MpegEncContext *s) -{ - int qscale = get_bits(&s->gb, 5); - if (s->q_scale_type) - return ff_mpeg2_non_linear_qscale[qscale]; - else - return qscale << 1; -} - #endif /* AVCODEC_MPEGVIDEO_H */ diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index cc23e070ea..b1b15c7fcf 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -31,6 +31,7 @@ #include "internal.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "thread.h" void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx) diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h new file mode 100644 index 0000000000..0cda0af733 --- /dev/null +++ b/libavcodec/mpegvideodec.h @@ -0,0 +1,67 @@ +/* + * MPEGVideo decoders header + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * Copyright (c) 2002-2004 Michael Niedermayer + * + * 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 + */ + +/** + * @file + * mpegvideo decoder header. + */ + +#ifndef AVCODEC_MPEGVIDEODEC_H +#define AVCODEC_MPEGVIDEODEC_H + +#include "libavutil/frame.h" +#include "avcodec.h" +#include "get_bits.h" +#include "mpegpicture.h" +#include "mpegvideo.h" +#include "mpegvideodata.h" + +/** + * Initialize the given MpegEncContext for decoding. + * the changed fields will not depend upon + * the prior state of the MpegEncContext. + */ +void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx); + +int ff_mpv_common_frame_size_change(MpegEncContext *s); + +int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx); +void ff_mpv_report_decode_progress(MpegEncContext *s); +void ff_mpv_frame_end(MpegEncContext *s); + +int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type); +int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src); +void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h); +void ff_mpeg_flush(AVCodecContext *avctx); + +void ff_print_debug_info(MpegEncContext *s, Picture *p, AVFrame *pict); + +static inline int mpeg_get_qscale(MpegEncContext *s) +{ + int qscale = get_bits(&s->gb, 5); + if (s->q_scale_type) + return ff_mpeg2_non_linear_qscale[qscale]; + else + return qscale << 1; +} + +#endif /* AVCODEC_MPEGVIDEODEC_H */ diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index dcf91f9828..65decf0a3c 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -27,6 +27,7 @@ #include "error_resilience.h" #include "internal.h" #include "mpeg_er.h" +#include "mpegvideodec.h" #include "msmpeg4dec.h" #include "qpeldsp.h" #include "vc1.h" diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 241ee53442..26cb9a2294 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -39,6 +39,7 @@ #include "mpeg_er.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "mpeg4video.h" #include "mpegvideodata.h" #include "rv10dec.h" diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index d11b8430e7..c84e09dd1a 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -28,6 +28,7 @@ #include "internal.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "golomb.h" #include "rv34.h" diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index e68072de06..bfef5f84cc 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -35,6 +35,7 @@ #include "error_resilience.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "golomb.h" #include "internal.h" #include "mathops.h" diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 0b3f733bc6..9cec0751e1 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -32,6 +32,7 @@ #include "internal.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "golomb.h" #include "rv34.h" diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index 26e0cd827c..2c27986490 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -23,6 +23,7 @@ #include "hwconfig.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "internal.h" #include "vaapi_decode.h" diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 6800499c85..94f31dd026 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -25,6 +25,7 @@ #include "internal.h" #include "mpeg4videodec.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "vaapi_decode.h" /** Reconstruct bitstream intra_dc_vlc_thr */ diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 4e9607d9be..0ae5a65fb2 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -22,6 +22,7 @@ #include "hwconfig.h" #include "internal.h" +#include "mpegvideodec.h" #include "vaapi_decode.h" #include "vc1.h" #include "vc1data.h" diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index c922efe4c8..119df4081d 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -29,6 +29,7 @@ #include "avcodec.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "msmpeg4data.h" #include "unary.h" #include "vc1.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 89cccc1929..700c787d99 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -33,6 +33,7 @@ #include "internal.h" #include "mpeg_er.h" #include "mpegvideo.h" +#include "mpegvideodec.h" #include "msmpeg4data.h" #include "msmpeg4dec.h" #include "profiles.h" diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index f96ac15e2a..5072071c70 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "decode.h" #include "internal.h" +#include "mpegvideodec.h" #include "vc1.h" #include "vdpau.h" #include "vdpau_internal.h"