From patchwork Tue Feb 1 13:06:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33990 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp603149iov; Tue, 1 Feb 2022 05:10:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5+gIwvp/O97JvxFz2cuLu8FTXLjPAlrZXSndaJ3lJF24c+9F3judd2A/bGMd/DNRGmjyG X-Received: by 2002:a17:907:16a9:: with SMTP id hc41mr21913664ejc.289.1643721034737; Tue, 01 Feb 2022 05:10:34 -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 di18si9811272ejc.397.2022.02.01.05.10.34; Tue, 01 Feb 2022 05:10:34 -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=oAwRCu72; 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 139AB68B316; Tue, 1 Feb 2022 15:07:48 +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-db8eur05olkn2064.outbound.protection.outlook.com [40.92.89.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B815768B2EC for ; Tue, 1 Feb 2022 15:07:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YG2h2iy/tDch1ThvWS0ja+fdMkYN1mWeZCNr2/EC2xTT06kWFK7xMia4b34w6XqR5A0mJzAm0SQ6iqU/4PpIARhLJb93AVQ9bCE5Bf/Z2i4hzP31XOc1rp+QjA8UBG5B5a0h8d8KtXWAiaus/C1h6d3eu3/LkbXC9HKjtCn9+a5VB5+2siiuEvfg8pVbz4Ns07eLqLq8bzyhVQhsFd/I2LDB7S8qiOXV4ii1R1CWDo4UliICvCs+A47zk+AD+qM+50j0FN04ubZckGnZ21/XhFnDYiKG+oYqsfgTlHR8NFpnTKvVVwCFTqG/GBbEizyHAY2/oz8l8sYvR5CRHPx2fw== 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=GoZFfqygUY8+iCbCz/qM5b+58EzLE5e2Q6SJxO2Y8yo=; b=haFxbUPZVh+PBi/Vbj8tk6kQzlbXEwgkZQcs5U0TBSdXlMZZ8w4f4UyvYPKyVGSf8jn3tkc+xyS9khMfDfHhp8mqb7v6CsQYYEEjyY4AU5/cFM1FUXqRUXO3pmNbvsWnaxnKSEie7p1I8odw4lgQXuSHESnpICDgDVgzx+y5vctj2FAiq0zpUH08CnKs6LU8KsRp8MhI+paQhMqhtlqTOuNyYvrju2KZF09fLbKo7RsXX41Oz33XmQ/wEdicvFKyupEzHcRlT2I2cPcAzAjcZgoASfYCMN3C9RW2stALwzR3Q3H//vVEs/hkIVGB4rVvfv2HiwUj09lCqYcd7M3w7g== 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=GoZFfqygUY8+iCbCz/qM5b+58EzLE5e2Q6SJxO2Y8yo=; b=oAwRCu72AUoLMEvgptZNhcvSTmeYzpq1CEgXIBDLdofjt82DvT58ZJNmxMZFaXhqwIBxJAeamy6p3s6nHP95SkboNjJaEJ1N0KrTA0OTTL36YnsX5/6Jf9oAAx4L59VwvCkX8GHCW5DZr5ysE3ue87KcDKdnils9RjAsCAeVqu72tOwUre9VKDtdEJBTNOx3PHZQkRzlj0/da+WPKcFOjlxxT2VRk7rAUlvi0qH2SHQ1iAJU7ZgGBQ7ze9Mhy4y5H6MeVc+Y3XhCDIstBTJ++2upvLdK007/jeML818SWhzCkZK8mViXeiTWTZnc4AXtAC/RHemMZmLG+GRF8ZAxBA== 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:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:13 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [igyq/P1qonf3tcDkWsBwGM/8H9/d8lrY] 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-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b5c1184-2810-4a5e-6edc-08d9e583d2f2 X-MS-TrafficTypeDiagnostic: AM0PR03MB5700:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qbBNL+IrqxUotS1SuvmmO/WneBWIwL6IhJzg49paSkEer/jzD+f+RgWvYz91koIieLZSOdHo8LwQGUr48TuhhJ3GPlV8wbstppydSAS7lzYYo+MrP8fx864SKecz8NjoIg3TuJmhJnDS4dTPusFb0ucXykHddLiQuGaBoLXSdlxRRhLeVRieNsuPCxzc1bdhwfj1l4UWGoMNCC6UF53XAp5cOKbIAjBgZPMPru+jqE5CAVDZ7+u/9loftSodGpoWh20fSKYxRQRrfb8d4h8vvdlCvFG5MieZWpdpTfl2EybGsi+3kuDLjjgiuljPfyULRMPQnIykjzG8hVAQc0IV6d6da7snzYl2EgZ8ei7FPANpP4ebpwnbljKhjUDvOQbNnvgECazo7az206S840UARlKWxskEGV/SIzgUVZFMCe1EDCSaZEsMkbDUxXQbZRWaULaQ/B0SznGId/JyZKIjlg8lgaz+fRYdgno0otoJkN3sqQrUscyYlLJHuSvus71ZYmQ+kaNLoMw/6HleIBSSZCDEYSvkCgTec+Qguhf/rmOLsNBJtcJEfHEzJ/8IwmH1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1xIaRj531lU/Jr/UiP+4AZFbD5Z0gNO6j1Ul8hZltGEM+BitmvA9f+VFQ3jcKMRgNVD1ViryldGAQyb/xvdDJYM0YzkSgJjbJ2ExXokJ4WlYG0i6q2/J/wdlPUj6W43lz3FMhOl9gDCya5lg1NVVTrgLVpgKEcvKnfdryAeSv79U+UZste7WkeN+3aE72Ml03ppXgc3xlf8xdHsMHt8Z7+o7v/SPuVIaAlzHmWPwjcEVbbcpmrztBcglsyXAOyN/oZg3o/C4HrIszIpe4Es0beLpClbFEyENI389gD1ZQv0s6PZVJiHn8qnSXIjc+gkBo/ymjSsC7SDm0Oe6p1UfsMIh/MNC+qd+BNzzugAf6/RHgXThSZEX/wfMPzB93NSHxMRdQmXg4uEt+vvJBRQLSIMtLrZhSjXFnuOOAWiP5mQI2PxfSFW2R9YRiOEwB9ATIAtqYWPZiIIufHL6h0Wr6NQcFJaxsDTnDygGU8xqzypsMK0uTMPz9573Au5Fmiit6IfLpsztY29GqTVsTIuC3fKC9WCa3KMnw6pJ3GXuw22qlZyrST34w7fkXgR0DlJZ/uqO0MEXB+iLX8a2ByDStc6FZAonUBfrK+gjcpazTTqNnHQqEvvibpk2ypLk+LTyq509Sv3Rw3+yWa14Y9IWhtH/uiLgDZfj9XW1E24UyqIG6YdGF8FXfGaGHD0YxmZDKKwTO30E28HZQz0TM4dXP77TjKsDH1uBHutiG8JqTBEIXiYqGY/tKJTpBkm/yrK+SR7ZV2Kr8VRdYrDCQ+3caBPj1X4Tk1r+AwYxEWMBbq2VEdUghLuHDgIUe7YeuyR2t3/YvLVjnPBI9dhHhLz73lp1lEne7QrTeiKvqOTETXtrxZljq/KMiNJM6sE2uJPNeZctu3CWr9qQ4y6jyfffXz7sBlpmfX7WX6owXueqgb9yqN79HAfy3R1b24LEj2pxZWXmrhNlPJ9kIM6TLwU7XQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b5c1184-2810-4a5e-6edc-08d9e583d2f2 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:39.3309 (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 16/69] avcodec/h263.h: Move encoder-only stuff to a new header h263enc.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: RsTDSA/ElQGs Signed-off-by: Andreas Rheinhardt --- libavcodec/h263.h | 101 ---------------------------- libavcodec/h263enc.h | 130 +++++++++++++++++++++++++++++++++++++ libavcodec/ituh263enc.c | 1 + libavcodec/mpeg4videodec.c | 1 + libavcodec/mpeg4videoenc.c | 1 + libavcodec/mpegvideo_enc.c | 1 + libavcodec/msmpeg4dec.c | 1 + libavcodec/msmpeg4enc.c | 1 + libavcodec/rv20enc.c | 2 +- libavcodec/snowenc.c | 2 +- libavcodec/svq1enc.c | 1 + 11 files changed, 139 insertions(+), 103 deletions(-) create mode 100644 libavcodec/h263enc.h diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 6dd5d2295a..27a5f31c59 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -20,119 +20,18 @@ #ifndef AVCODEC_H263_H #define AVCODEC_H263_H -#include #include "libavutil/rational.h" #include "mpegvideo.h" -#include "h263data.h" #define FF_ASPECT_EXTENDED 15 #define H263_GOB_HEIGHT(h) ((h) <= 400 ? 1 : (h) <= 800 ? 2 : 4) av_const int ff_h263_aspect_to_info(AVRational aspect); -void ff_h263_encode_mb(MpegEncContext *s, - int16_t block[6][64], - int motion_x, int motion_y); -void ff_h263_encode_picture_header(MpegEncContext *s, int picture_number); -void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line); int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir, int *px, int *py); -void ff_h263_encode_init(MpegEncContext *s); void ff_h263_init_rl_inter(void); void ff_h263_update_motion_val(MpegEncContext * s); void ff_h263_loop_filter(MpegEncContext * s); -void ff_h263_encode_mba(MpegEncContext *s); -void ff_init_qscale_tab(MpegEncContext *s); - - -void ff_clean_h263_qscales(MpegEncContext *s); -void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code); - - -static inline int h263_get_motion_length(int val, int f_code){ - int bit_size, code, sign; - - if (val == 0) { - return 1; /* ff_mvtab[0][1] */ - } else { - bit_size = f_code - 1; - /* modulo encoding */ - val = sign_extend(val, 6 + bit_size); - sign = val >> 31; - val = (val ^ sign) - sign; /* val = FFABS(val) */ - val--; - code = (val >> bit_size) + 1; - - return ff_mvtab[code][1] + 1 + bit_size; - } -} - -static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code){ - if (s->avctx->flags2 & AV_CODEC_FLAG2_NO_OUTPUT) { - skip_put_bits(&s->pb, - h263_get_motion_length(x, f_code) - +h263_get_motion_length(y, f_code)); - }else{ - ff_h263_encode_motion(&s->pb, x, f_code); - ff_h263_encode_motion(&s->pb, y, f_code); - } -} - -static inline int get_p_cbp(MpegEncContext * s, - int16_t block[6][64], - int motion_x, int motion_y){ - int cbp, i; - - if (s->mpv_flags & FF_MPV_FLAG_CBP_RD) { - int best_cbpy_score= INT_MAX; - int best_cbpc_score= INT_MAX; - int cbpc = (-1), cbpy= (-1); - const int offset= (s->mv_type==MV_TYPE_16X16 ? 0 : 16) + (s->dquant ? 8 : 0); - const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); - - for(i=0; i<4; i++){ - int score= ff_h263_inter_MCBPC_bits[i + offset] * lambda; - if(i&1) score += s->coded_score[5]; - if(i&2) score += s->coded_score[4]; - - if(score < best_cbpc_score){ - best_cbpc_score= score; - cbpc= i; - } - } - - for(i=0; i<16; i++){ - int score= ff_h263_cbpy_tab[i ^ 0xF][1] * lambda; - if(i&1) score += s->coded_score[3]; - if(i&2) score += s->coded_score[2]; - if(i&4) score += s->coded_score[1]; - if(i&8) score += s->coded_score[0]; - - if(score < best_cbpy_score){ - best_cbpy_score= score; - cbpy= i; - } - } - cbp= cbpc + 4*cbpy; - if ((motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16){ - if(best_cbpy_score + best_cbpc_score + 2*lambda >= 0) - cbp= 0; - } - - for (i = 0; i < 6; i++) { - if (s->block_last_index[i] >= 0 && ((cbp >> (5 - i))&1)==0 ){ - s->block_last_index[i]= -1; - s->bdsp.clear_block(s->block[i]); - } - } - }else{ - cbp= 0; - for (i = 0; i < 6; i++) { - if (s->block_last_index[i] >= 0) - cbp |= 1 << (5 - i); - } - } - return cbp; -} #endif /* AVCODEC_H263_H */ diff --git a/libavcodec/h263enc.h b/libavcodec/h263enc.h new file mode 100644 index 0000000000..31f00665ce --- /dev/null +++ b/libavcodec/h263enc.h @@ -0,0 +1,130 @@ +/* + * H.263 encoder header + * + * 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_H263ENC_H +#define AVCODEC_H263ENC_H + +#include +#include "h263data.h" +#include "mpegvideo.h" + +void ff_h263_encode_init(MpegEncContext *s); +void ff_h263_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line); +void ff_h263_encode_mb(MpegEncContext *s, + int16_t block[6][64], + int motion_x, int motion_y); +void ff_h263_encode_mba(MpegEncContext *s); + +void ff_init_qscale_tab(MpegEncContext *s); +void ff_clean_h263_qscales(MpegEncContext *s); + +void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code); + + +static inline int h263_get_motion_length(int val, int f_code) +{ + int bit_size, code, sign; + + if (val == 0) { + return 1; /* ff_mvtab[0][1] */ + } else { + bit_size = f_code - 1; + /* modulo encoding */ + val = sign_extend(val, 6 + bit_size); + sign = val >> 31; + val = (val ^ sign) - sign; /* val = FFABS(val) */ + val--; + code = (val >> bit_size) + 1; + + return ff_mvtab[code][1] + 1 + bit_size; + } +} + +static inline void ff_h263_encode_motion_vector(MpegEncContext * s, + int x, int y, int f_code) +{ + if (s->avctx->flags2 & AV_CODEC_FLAG2_NO_OUTPUT) { + skip_put_bits(&s->pb, + h263_get_motion_length(x, f_code) + + h263_get_motion_length(y, f_code)); + } else { + ff_h263_encode_motion(&s->pb, x, f_code); + ff_h263_encode_motion(&s->pb, y, f_code); + } +} + +static inline int get_p_cbp(MpegEncContext * s, + int16_t block[6][64], + int motion_x, int motion_y){ + int cbp; + + if (s->mpv_flags & FF_MPV_FLAG_CBP_RD) { + int best_cbpy_score = INT_MAX; + int best_cbpc_score = INT_MAX; + int cbpc = (-1), cbpy = (-1); + const int offset = (s->mv_type == MV_TYPE_16X16 ? 0 : 16) + (s->dquant ? 8 : 0); + const int lambda = s->lambda2 >> (FF_LAMBDA_SHIFT - 6); + + for (int i = 0; i < 4; i++) { + int score = ff_h263_inter_MCBPC_bits[i + offset] * lambda; + if (i & 1) score += s->coded_score[5]; + if (i & 2) score += s->coded_score[4]; + + if (score < best_cbpc_score) { + best_cbpc_score = score; + cbpc = i; + } + } + + for (int i = 0; i < 16; i++) { + int score= ff_h263_cbpy_tab[i ^ 0xF][1] * lambda; + if (i & 1) score += s->coded_score[3]; + if (i & 2) score += s->coded_score[2]; + if (i & 4) score += s->coded_score[1]; + if (i & 8) score += s->coded_score[0]; + + if (score < best_cbpy_score) { + best_cbpy_score = score; + cbpy = i; + } + } + cbp = cbpc + 4 * cbpy; + if (!(motion_x | motion_y | s->dquant) && s->mv_type == MV_TYPE_16X16) { + if (best_cbpy_score + best_cbpc_score + 2 * lambda >= 0) + cbp= 0; + } + + for (int i = 0; i < 6; i++) { + if (s->block_last_index[i] >= 0 && !((cbp >> (5 - i)) & 1)) { + s->block_last_index[i] = -1; + s->bdsp.clear_block(s->block[i]); + } + } + } else { + cbp = 0; + for (int i = 0; i < 6; i++) { + if (s->block_last_index[i] >= 0) + cbp |= 1 << (5 - i); + } + } + return cbp; +} + +#endif diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 9253d60a16..70ac1f643b 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -35,6 +35,7 @@ #include "mpegvideo.h" #include "mpegvideodata.h" #include "h263.h" +#include "h263enc.h" #include "h263data.h" #include "mathops.h" #include "mpegutils.h" diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 2aea845580..c0eaa00eba 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -36,6 +36,7 @@ #include "mpeg4video.h" #include "mpeg4videodata.h" #include "h263.h" +#include "h263data.h" #include "h263dec.h" #include "profiles.h" #include "thread.h" diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 27e16c3b72..8a1a6cbcc8 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -27,6 +27,7 @@ #include "mpegutils.h" #include "mpegvideo.h" #include "h263.h" +#include "h263enc.h" #include "mpeg4video.h" #include "mpeg4videodata.h" #include "profiles.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0dde4edc73..a57de01944 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -51,6 +51,7 @@ #include "h261enc.h" #include "h263.h" #include "h263data.h" +#include "h263enc.h" #include "mjpegenc_common.h" #include "mathops.h" #include "mpegutils.h" diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index a7870f252f..08abece9ec 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -30,6 +30,7 @@ #include "msmpeg4dec.h" #include "libavutil/imgutils.h" #include "h263.h" +#include "h263data.h" #include "h263dec.h" #include "mpeg4video.h" #include "msmpeg4data.h" diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index c436f78f9d..16e19083da 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -35,6 +35,7 @@ #include "libavutil/thread.h" #include "mpegvideo.h" #include "h263.h" +#include "h263enc.h" #include "internal.h" #include "mpeg4video.h" #include "msmpeg4.h" diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 19b6aab278..204cd03a24 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -27,8 +27,8 @@ #include "mpegvideo.h" #include "mpegvideodata.h" -#include "h263.h" #include "h263data.h" +#include "h263enc.h" #include "put_bits.h" #include "rv10.h" diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index df31eb8132..e169ae601d 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -34,7 +34,7 @@ #include "mathops.h" #include "mpegvideo.h" -#include "h263.h" +#include "h263enc.h" static av_cold int encode_init(AVCodecContext *avctx) { diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 11cbd97185..9cef3d8ef6 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -32,6 +32,7 @@ #include "me_cmp.h" #include "mpegvideo.h" #include "h263.h" +#include "h263enc.h" #include "internal.h" #include "mpegutils.h" #include "packet_internal.h"