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 9100F4055F for ; Tue, 25 Jan 2022 17:44:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86AF168B190; Tue, 25 Jan 2022 19:42:33 +0200 (EET) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068086.outbound.protection.outlook.com [40.92.68.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16E0468B163 for ; Tue, 25 Jan 2022 19:42:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CnWRMDWj5kUAy3Ri8U2jRrVdxGPB36DAgVaDZVNqFW0lxksKJ3Fs9OiuO1XGjuf6OXFnUxHsGgfnGKdZ1tNhgzvl6f+gMBNyFg4rvjhYGJJzDr2rcGLlGDjZQZhtx1law+olR2VIuG+SdjcuRAOWbobmXlStp8t4EIk81OWfdBckE/G372cGg3Ggf0Ze8drupXueROJpKmvveRj0vi8LaZb18MslpfuO1bQrEpDLYEhmg5xryEX0oPWNaO40anMT9rdXM94i3P8jrH+dtdQrIao/gDv6SwePOx+GsQjH0rFm3X3HLiyCAjFnThtYELf80QPLktaB34uGNGKJsI+DCw== 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=uVUwI1PxcRlzjm+xEREyrz3U4KvzlgkpwZAs3AuGD1Q=; b=EwCl1fxbv9XIPh0t9b4UUrxEiJH4BGls/UGW/SeOvGmN2Sg3uG0q17xqTevYFMBmMM6ZIHGeP7mIoykLYm4wcMofJ+0i/PlxEgABiA07E3LnIZJ3EHAyeZwvCgp/BcWLDJu98wfsfJec9YgkIjNqSmTIT/srRqRgMjrmMKQbyjhqSZRJrmmV21GUy5D4N9nrU5DnvzYebxcS8lg6fES3EqvxTKb/93c47wPU4i6yqVh3zUesCRRPRoAmk9kIULCdQ5rwoAhjTgrmaTzvb9zyGSDCgFS5cui0dvLC+//aLisuPj92b2J0l2eCjs9gkIr2OG8m6UHOhLZEYAESgF0H0A== 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=uVUwI1PxcRlzjm+xEREyrz3U4KvzlgkpwZAs3AuGD1Q=; b=boRYtOyPAVaPX29ilC2bIZxyIQMuHM6QmitvhAaCPIGzaQVToKF7rHTOfFTQ6Y33M2Jc7eavC3WFo47baf7irlNrA6vqKbPgsRroVqnxTrJC7h72R/TyxxIE4aWrV9cz0BSTJyW8pzgcyEh04MchfDEUTELsywJrmI10M/388b1X9Hxoee32Kyyea8W0vetXLYP2Tj5m7kIqXSenQs6tL0XB7cQT8JgtBw/EaQOdlXQreKuBKAvwYX6+6IPQctb0UWaZDD2JPLFVBwr9ite0hZOoPB6O2XeAB2zazJJMoqXKAWBOvdKpJT1k9aGQKjmBCPBG7lRsV2oOKJXqPiKoAw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB3500.eurprd03.prod.outlook.com (2603:10a6:5:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.12; Tue, 25 Jan 2022 17:42:27 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.015; Tue, 25 Jan 2022 17:42:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:45 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> References: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> X-TMN: [Ik4LzJSGbbLDbi5I/UFWi2U9WzAWRVtu] X-ClientProxiedBy: AM6P193CA0061.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220125174148.994967-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d376555-66d1-4d00-cc3f-08d9e02a0de1 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5+FSsuWbDTfvhPX1zuiWecSRi1rojw5FjXN51ZJmNFcfHWFjGYQZGkgOUgeEBBLdZELDmBZEMAMk0Y+tpu9SyIhDxIHpcfxLoijp0olc6thpeTZWgAyyH6NP0SpD+O23YFexYUIbzf6rubEGoQbeO2LC+Jh5QeA6X5z/UgWmuIGEtW5n1lJBLiBJvRLm0iKB7CDTmPV24YD0jkiJd2v8lUEQ1VLhus6StXmnFJB8xBd1sFyOFQzw4Brvk7IE7X+EdvvSuiTTUENnY3EobB917flSae2IU/xZ4/aY9lu7M2etMO/cgoWvT6XU0Gl28njNQsvDl/HGzUBHIoYGm5tE5jm/cGDuy+tDQLLkHoj+REpk43CzCp3vHu5C3k1RxE1SqK16oswA04DtMlV7+AP++KBATaRzE3p1RTv8QrBPrfO2ehZqj3vjSu6Ld9bCy0X1S/NFJW5sfxzZ/NIBKE3foxuQRrumJgDpN7HBMrhREAh4CW23ERZTeD1d+plRuYYMDsht1vyPhzBnVn6HH28l4jSER7G7LK34238ZsyPlaUaiiQn/dGdcaSDKDFX4y2J2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gLJfKd+HLnCYO7kvW5MtrUf/60c/QYnfwWWiuIELMSCyVo9lGffDUiU6vvZQ?= =?us-ascii?Q?RTgfHXSwoNQTiXti5P7QQqbXkPouHkyK8ti7N78gouTU3SpDOipn2WeCto0M?= =?us-ascii?Q?q9bzq6HMbj9DJ+GwPnLO40ckC3dCKp1eIOyWekNrxJ4oCPkXHd4SYVqcMRmM?= =?us-ascii?Q?gytBpSxIbkbvzTRTVhaoo9TtQzc9x/xe1TEHqKu184TzRIM8X22aQkaZM0fR?= =?us-ascii?Q?imRvUjzpoyAz0XaN9t6UN6hsSZztEaS6bCxPojLXSd1Bgq2geewpcmlQZRnq?= =?us-ascii?Q?Plbh0o4QN9Pc46BRSHEy8xEfoUPeDDVCS41f+5XMO3sioUn1a0wuFLtPSgHm?= =?us-ascii?Q?ev6lHe+VL7C1yPxyY28tYQC9V4mf0WEbAp+C4y4Rw2Pr67aEZNQxfOQR2zl9?= =?us-ascii?Q?FW/8qKsxPhKBE1vGFbNwFjA26z0GqRyXSPmRvUJKqnz8ltyXUHB7PsvAowWF?= =?us-ascii?Q?V9MCPJ/uTepI0vHkJkNYaXx5wMQcK+beC2mX77aehapalrCfbsenYSGfyCh+?= =?us-ascii?Q?GhDGLsB+o4ieSF+5w96dfFiz/phy6Kw9YYFwLyYdhRrnq/x660OQoovRuvc3?= =?us-ascii?Q?LXGADEXweL8KZLzKMD5F5DEt3Kh0ndKZn5IUfJEaojoKH+ju4U34kR0NX/0H?= =?us-ascii?Q?941XykT5siZzlFVwGATRcWRvlP8VKjiiK98IwakcShIsSD6qGNM+o90u8cwl?= =?us-ascii?Q?z3390C5MKYyMfC//J6NWR06Nal4hchOHupAt2HWB3KRzBzN8NPFOGLfhZMiy?= =?us-ascii?Q?+4sejOeHxM8C45Y0p0PcyB9tiJ7ZQqQdKEmx1/824AwzF5xK9+tUDtnzGOTc?= =?us-ascii?Q?UmUPJJTPC8taRDqoNnvM9dhDoa+x5LKgoCQWMvacJtWSUNqcoNTSXAcwpR+s?= =?us-ascii?Q?/Qt5v+0fbcamz7ZY4RL+dQ4ynlg0ZetXB0M46mgP+9lv5fudxZVRF8OMh/ta?= =?us-ascii?Q?CgjbZnpEMKDkVs7f+1C6kA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d376555-66d1-4d00-cc3f-08d9e02a0de1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 17:42:27.6723 (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: DB7PR03MB3500 Subject: [FFmpeg-devel] [PATCH 18/21] avcodec/mpegvideo_enc: Move msmpeg4/wmv1 encoders to msmpeg4enc.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 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/mpegvideo_enc.c | 42 -------------------------------------- libavcodec/msmpeg4enc.c | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 93deded66c..4c3c870013 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4628,45 +4628,3 @@ const AVCodec ff_h263p_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &h263p_class, }; - -const AVCodec ff_msmpeg4v2_encoder = { - .name = "msmpeg4v2", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_MSMPEG4V2, - .priv_class = &ff_mpv_enc_class, - .priv_data_size = sizeof(MpegEncContext), - .init = ff_mpv_encode_init, - .encode2 = ff_mpv_encode_picture, - .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, -}; - -const AVCodec ff_msmpeg4v3_encoder = { - .name = "msmpeg4", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_MSMPEG4V3, - .priv_class = &ff_mpv_enc_class, - .priv_data_size = sizeof(MpegEncContext), - .init = ff_mpv_encode_init, - .encode2 = ff_mpv_encode_picture, - .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, -}; - -const AVCodec ff_wmv1_encoder = { - .name = "wmv1", - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_WMV1, - .priv_class = &ff_mpv_enc_class, - .priv_data_size = sizeof(MpegEncContext), - .init = ff_mpv_encode_init, - .encode2 = ff_mpv_encode_picture, - .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, -}; diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index a4efbd34e6..2c619e1210 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -669,3 +669,45 @@ void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n) } } } + +const AVCodec ff_msmpeg4v2_encoder = { + .name = "msmpeg4v2", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MSMPEG4V2, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .priv_class = &ff_mpv_enc_class, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .priv_data_size = sizeof(MpegEncContext), + .init = ff_mpv_encode_init, + .encode2 = ff_mpv_encode_picture, + .close = ff_mpv_encode_end, +}; + +const AVCodec ff_msmpeg4v3_encoder = { + .name = "msmpeg4", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MSMPEG4V3, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .priv_class = &ff_mpv_enc_class, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .priv_data_size = sizeof(MpegEncContext), + .init = ff_mpv_encode_init, + .encode2 = ff_mpv_encode_picture, + .close = ff_mpv_encode_end, +}; + +const AVCodec ff_wmv1_encoder = { + .name = "wmv1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_WMV1, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .priv_class = &ff_mpv_enc_class, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .priv_data_size = sizeof(MpegEncContext), + .init = ff_mpv_encode_init, + .encode2 = ff_mpv_encode_picture, + .close = ff_mpv_encode_end, +}; -- 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".