From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1C0724073C for ; Sun, 30 Jan 2022 06:29:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C43C368B17A; Sun, 30 Jan 2022 08:28:29 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32C2C68B10D for ; Sun, 30 Jan 2022 08:28:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I/6LEi13tH60o9kHp0TsP7imPz68vdC9xp4WAhrQTSWr0F43c3f0PEviFwtperDjAS3tb35b+lSScQztyfmSaErN7mIWG7EN6X/jo2PPluCWsVz6naIj2Luy+hT7CSLLn3SsQbxx0TVVvzKYGS71Ce9T7g6OWhWX6R/o/7OHa1CU5RpAzsnS9VfOsLDU1WMEiUyRYIjbZs/BY/YjYdrUcc45Levfo83FTPJHC8TWwTemfwisvucJBGQfKtKXxIGLzFQJFwT/xj9LqMcLLvWqvhKHWHxZ1TeOgC8nv59LGSB92PXE8JBzgSM4aOowoHad8PSU6cm+rmH8yxgqxqypXA== 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=1x1l4k7cXiV2pw5ziidNoRrUCclCxOeI06oZBAzYMJU=; b=aTh2NmQdmZLTLlWhUFDx7mRB4e1dG437GQo4r/RaCZ3GxrmL9CvH1xZdai9npjZo8YhEG2nYdhAO89LuOqD+zKK4GHAhNifJy1Mq8UtHRLQG25zVt2wgu9PakMxNS03U9uWeT5f4lP9jKEMIuuEPQpiT+NgNkdpPrrsuUU2TI8Rq8SJ14DsMz+6MgKThDap7o5tum+aapZdDSazYG1zg5wgtwQWGbHs1cFZDtgSUz3IFP99zPDkCE30msO3mQTmeWbtMJanhUh14XKbie0LY362WeV0MdmIbTASVgDds6H2Sajjfl32GzwzWOzNmGzsMqK9AAa+iq154+2PuMRimnQ== 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=1x1l4k7cXiV2pw5ziidNoRrUCclCxOeI06oZBAzYMJU=; b=GmT5YnSqImXoGn9oDg0bOHS2WhfIiScgxE5G26DCbdoESSxnjgMY9FYsuu47Ti0FCoYD4T5IeOaN6ZqpF1a51a5HPN4Tva7YiWBjHX5NyN3DMK8UbaNqxhrvinyx9x8kWCEQkg59ANNunPGLgiHs1EpNUi6TSWvsAg2f7meOHY+N3WAAFc2R40OYZv/l2jNf32UJ8EQTfGPYGUs4e30Rbdk+g/06FwltQjcXfq46KywqV/pHjaz9mZswgGmesgsedpjBV3OTV+LrFmIwYYdIY+kp2Rxh8iZP4h7hUaAjLI4UECzDK1925NwJKc6AGFHtS3heTJ1cMTYgbiDmlvHHTA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by PAXPR03MB7666.eurprd03.prod.outlook.com (2603:10a6:102:202::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:28:26 +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.4930.021; Sun, 30 Jan 2022 06:28:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:20 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [WAeBdTZ2KL7BZSZC+g1tzufHCApfFZaG] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb20b4b0-b93d-45a8-63ce-08d9e3b9b909 X-MS-TrafficTypeDiagnostic: PAXPR03MB7666:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SVWxbvjEyDBhOkLag3RgX+vsijSCQwxIVC5dO2avcZOuNlQOlnHP4nWd/a5qBRuWPoo4rXpJK1bDJBnupatXR3eQk/kcZU9L8WuK3sDiTkkZFzRYWa6DLeY0A8HgmMcf8tigjGgDKP+mm2VFguqWt1cdkB/aDI0TeOIhIbIKsHigzRjqpCkDjxZqHFKM3cBj4ASpLvsYzijthPwd02e2MU0UNAkbFojliVNQdgJzd0/I2jWF6t1hZluevgX3N+M3lvU0M8HGj6lVa+fzuxsLSNW7HFwc/8GVoUm2PMJENYec5+MKksvJh8MEhNE0kEDREBl/dZXh4lEqNUQrABZ3oa7JRZJiyxFNXbWLsWN+v1ZJmyrgbegZF7uBQT3mT9JWAjibIMKI0oX9feoHasYH0TyP8QhzzKlrb5TySzDZrhU2BFCZSZ/Uzo28b5aEvwoz4vEv1wZeTXXYj8OCRgo1BquEfAZWzYKSr/tA8tlG0mBQaybtMRSUIIDBJHW19ODbL+BzJLvQ68o8LY1+E0ZaQwUv2uoINMMyUt0SXM8JKhVitdfiR+uqkkvLzCvG1e/1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XFDRuIXS4VyK0rkx+MK+OOT8zqF1Y76RwNVv5JwoWpDhb9zWQdjxVSvyHltO?= =?us-ascii?Q?G7gQjP4D15vIRhQjDaf5ImhhBMUtFuNTWjGFgVwjJQlcBJOIgkdriP08ZkNk?= =?us-ascii?Q?YzZp8Cwb4aWp/1Ace2w2YUhJJpDmb+9RtlHQM4qTlWUsC/t/omQGzUmFUxZQ?= =?us-ascii?Q?oUTc1+GnOMQoWF268GIN69JoNHag5zJYW4zejJ2XL3/m4daotDC9+u6EMZbG?= =?us-ascii?Q?XK80OuVSBUnXe2oGleFDT4CpdtC2lpL9a+WBMWIQZn1RsHaBtMsvmrpmJmxd?= =?us-ascii?Q?7jx4IkJslDec8v3cWYxwc5DPSi+vbUEAUVokRIe+VTDsTbB5/+bLV6nNW9+q?= =?us-ascii?Q?ZaDI2bTohw90fwzcyKBZISEDgK2pm3qLMB79md8Jysg6uInodIDWElB44Fyn?= =?us-ascii?Q?5NXaUnzhd04hopvOsK63enSXpG1i2LvXg1fu1jzp4Q/Ixjh7fP7jDRB8Dimd?= =?us-ascii?Q?3S1YvalsS2Ov+wlFZuqzUKhx37Tn2rBCVfCxUEGaKPUMGIVprFe83wuz3CXH?= =?us-ascii?Q?0mt/TIAOF1Fz+NyNY00L3vqe1F+uEf1deAnbajbPof5EHtE1X+lZJtzUSO37?= =?us-ascii?Q?Ek+oJR2ppmuvMP+X1GjS3U6RZdB5s8pgLwR1aVOmEnM9f2WAueD7IdJo43Ht?= =?us-ascii?Q?hgt7MPz2rD2EFwX/Hvq9XavALm5xKQOQ+t6xcN7wgyjsO9YmfQvDop762iHa?= =?us-ascii?Q?yaJ+vzIwHuagbPgew0ArOo2ovAVlltaLXDr6uwziVtHGxvKMyHOAlGnVU9Iy?= =?us-ascii?Q?zhIDQ859fqOEez1mz9Q45P4sitrQMcgPoiL2ipIGnpF1oXmdWeSz1Lm5zrzb?= =?us-ascii?Q?jmulOLuPsrb+FRMD5BsQzV8a7d750WxrEJSi0wuaVK+ZNRUhJwMxZnPHLUZY?= =?us-ascii?Q?65Fdfn4FmFwp6HyOOxapYfFX7orGCiOdkrK+4PyxYIPAXB4Z221MFPj55AXa?= =?us-ascii?Q?bhtDVOZ3I4nHjaPtRukRmg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb20b4b0-b93d-45a8-63ce-08d9e3b9b909 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:28:26.4835 (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: PAXPR03MB7666 Subject: [FFmpeg-devel] [PATCH 12/41] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavcodec/h263.h | 99 ---------------------------- 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(+), 101 deletions(-) create mode 100644 libavcodec/h263enc.h diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 6dd5d2295a..5e4a5bc6e5 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -20,119 +20,20 @@ #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 0e38824cca..5717b7422e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -51,6 +51,7 @@ #include "h261.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 3d2dcb9429..77ad8a8ff4 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -29,6 +29,7 @@ #include "msmpeg4.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" -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".