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 928EE4288F for ; Sat, 8 Jan 2022 20:09:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7ECC868A962; Sat, 8 Jan 2022 22:09:15 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075077.outbound.protection.outlook.com [40.92.75.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB13768A83E for ; Sat, 8 Jan 2022 22:09:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eHo4Mypgk/VDGDPRRKaTGladLGT2t5srnVret87bec5MjAhsmZ5J1H6ZmwqOr+U/OqZx29pFIwNUjvarF1ntrEFRV5g3wKy2/6SOdytyuB2uHxasWIYwrK39sDCLv42XRGDSBDDCC5LXWmz2cKK5rBIEk3mbDZzv8KMsyC0QfEGM1mhE7klYhlWxqyXq5E/a/7jomR5IlhjX1oJOl9jEnVwjpa0EeYTBifHzau/ITwY478JjZ37mL1uxYbYLFXi/gtp5RaNi3SX+LV7jif5eh25+5TwSetQ+eMbLvRC3WLWfdwPAAoa5eT19mB6GISzu7cdZo73s7vjPDUbzofzN2w== 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=CCzttE+6OepidtIhUb0kEyXn40UY17pNFlU5g6dY36o=; b=apKuD3ulvNzdXIvKjXo52/ae+nYcL7sHyTjUIQJwsV7swJQoifcSUu2XpiUHTmmtnIcMNnAUyWYVZI/QUqTpaE7SRxNT/GNvJm0qpoUr48sgbUnwuO4P40z83WaY6YA9GPEuwp9hIKUCyuoJZv9Yn2Mlzvw1i2DG6KxcHpvwRjIj0kddlFLAQQ15CG/Hxbf40nvCFsu34jCyVj3374zZndUBCN+Y1nKbTPXTDBAap2eFJ+XMBc9oLRJqb93wnMs+VsWSRddvqjJvPi+2lbb65wT3MNfjqja11EUXiaKsxhxuMCE0BdaOUD9xY9/sUdYRcqJCCfrY51lpnPgHJ71xtA== 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=CCzttE+6OepidtIhUb0kEyXn40UY17pNFlU5g6dY36o=; b=fVkqQD1JieVvLuvSMveNLuYDog4XQhBZZ3MMegKA0Pkh0i/Lflt5dNhSf719Mr3je60GUcKTHd6veo0Xc9X9OnKho/EABBBu9fJ1XQArvKVNSAWu03aIda9wFGi69kHMTZ4cAXlEyUVOIQe/QjwUrZMGQDd9kg6KIuvcykfE23qc0QA9FgWue5zROG+x6qZr9JQ02EU+L9ngmwrb0oTIErfxJRW10nC5IA7fgu1UuyQUxbHZMKCpdqv8+lEo23VG/Ep1wZvFTPJt6UiSpVp0zhZivRCIioYEpshPkwYiyM6iupB3AQyuGmo5I0nXxb6UYmztq+y+vVrhxMHOEK4LKQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5378.eurprd03.prod.outlook.com (2603:10a6:20b:c3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Sat, 8 Jan 2022 20:09:06 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.011; Sat, 8 Jan 2022 20:09:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Jan 2022 21:08:58 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [RJWQtuxd6ZFWFNvH6S7QfH+tRsaJPWRu] X-ClientProxiedBy: AM0PR05CA0083.eurprd05.prod.outlook.com (2603:10a6:208:136::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220108200858.3747673-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f31852b2-8cac-451f-71fc-08d9d2e2b93e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlWNozkZXNZ7v7+8qBeooTUsi55CNv+e8MRINqqw2Uc2iCE3zOTCUptl6gp43uL+OaPT1wUQfAzYKnSxHgQ95O39RMQ3X8ntOihzHYZKgJRSufGozwkqOGUyVmt+IpzXqE9DXCO2nJt9Vf70O/ct7TNSh+pct3XaI9hEl+vTU+MW0Bb65outWZ+cXoATiyungsi8PwFDp77HOXMq2Wi+xRd4378Td29b/OcoBEBEKdJiL1W/YWIKmVfsK7fD1taeAE1uySQPW1G1JGh3L+XBpmE4yqGOSU7UPmE+7B1DHVIMc8yaFapWE3zn3NPj2T95/nteezW962zKE7xpFcCJXrvyejmZrnd2sZJhwdWyg3mm0rprXA2w7m6yTK2mj7njNaOfdtXqLXThAk8uQONEdC2p9S/1GV/d+dl3vy46dQyvow5XCCSKKK5XYTt8aombLKc6eWWxTX0e72tGwjmsjHdjxrjYE8FtRXmH13Jfi4VM37i1QjPRw001JUSTDbm35CPGQBj2HIsu5wnhtbBKHbaVXiXNNta5L/YkbJdL9ZtC37vW+8D3lGq9J5RgtmBuHclZbKkcjuqh/40Lr5k1BMhP4Bhr01XmNr5cPI3XcQXqg+UmMqcRjJe7xbIy+j+C39ZBDOfVPq1K11rMjcBLrWho4yAw/u6mtmy6BsB4298MYT8kmFVwPFF1sD5Id2+6RV3Gnhod9ESjk= X-MS-TrafficTypeDiagnostic: AM6PR03MB5378:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lP0LRkcn3tF2gCcHBAvv3EdEyGWkQSLkTs8r3tda4b5i4K/kNYFH6BLhPRGgg7jEf/eA5J4eWndDYUi4Nz9foNOmwJNn5xQ3LKTtBjPjrbGR6OEPBIVVT6XwU9Lge+u11w3kO5dR49UO7mgzCoYx7xaB9odaOLSeApGx897HhCrvNCy1D4w+Wx9QQi7RWSwBuUa/w8Bq75PGOWlnOKNdcCI3b1rx+KaRXazjdqKoGegNzRTVTZuqMD+ifPF8+4PgkbwMwZHB9VFeBAP0NuBgp7UPmCW42YBtpL0/SzjTCylqqn+Hco6Y6z4Xl2LvGByA7AA8SMZsrEg6YUk80xOWQzTEh+aDCS5fzxYDwRX5SrJ9jQwsBGrWkS94Q6MUyhMm00KZhqhO0hfxF+66igyiBntp1TW9ftaWH+VJN5cyAe1lccMANUULFYCNHhmvVsBvG3EL9MfPBQRBgf43nhBfYcqSAd2QXZinj00xx4HwV697lh451tWfgIs9QNlCGgoW4dhM7uqFCXRsDztaIZ+voMo+SwUh6xWg8M8ldoLL5xcaaagR2YYhZICWOAHIQz85CWRaUxkNPNsDarJ864AV4w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HbyqDbWM+w2eI75NserUH26PpqWMtIZg26hCnpHADDfbJ+hYBjzZaylWoj9I?= =?us-ascii?Q?d0zTIs29DaayTkM78tTftYPq0eNcw49qxtPJ4zM+XNSEkhm6pJBB2konjWj3?= =?us-ascii?Q?EJSPDkxwUNiiLgd7Tgdb9lwe1kWSbN/bW/AuBexymRfWiy2AsFPTKzyMXU22?= =?us-ascii?Q?iNV+lbRSQpduX4uPM63Do8zQGuVs8WBgqUPOSKxBvwJWvmVwQquSvK6EMjTl?= =?us-ascii?Q?VR0Ko5CQZqlnr/+UznJsElMh1LkxhKUeRGAYz1Bp0GTHXwibo0DFUymBZ79k?= =?us-ascii?Q?gXf17iDiIMbPJ6SVwgMwTkp8R8a0PEPRLn6GvPoPvsAxQCcklsbtLi/+IInH?= =?us-ascii?Q?yaIKHuK2+A8GNEwj2rIZ5kqUahoIbq+ydNZPYDHyubE50AwYnTfzzqAUvYb4?= =?us-ascii?Q?oLS8Id5K8WLumtnKyBkDa6VbeXxsi3nNparBsHf1sLeMBVB692B9wqjupeqn?= =?us-ascii?Q?yj53HxcySwdzRfPp7tg9BH87rjAPKbodOu7giFLFck8VWANbMH1+rTEz9bf4?= =?us-ascii?Q?yBcUQx9/A8mwOZfCjEtHYgGrMSH1WavBTjBiIYOU0u9pIvXEv60ErgVnZIzq?= =?us-ascii?Q?BJAUl4iIy7Q8H1yHcPTAH9R1pLcWOHzt58WyjhjvB/QSFGKpFxA7yeAVHMxE?= =?us-ascii?Q?i8ub6pxp0ciLgc9vCJr5AEHMU3QcfqHC+yikebJfEKVVy9SsOXH70OBXNaTc?= =?us-ascii?Q?pmOzF9L5OUCYpZ1BOwYm9KUj7jjbqSC+ZnYjMTtQLKFwhju4yZojVjNKlkH8?= =?us-ascii?Q?PUPVl8nPQKZyn/BCKhPX0l7WSlKsIpLXRmo5VbosU+LRPZmeTYPDCMXPWDTi?= =?us-ascii?Q?dUbB7JWmUhb5Pz64ywJ02oxWDQSIlRgrtVkwdLMVTKaWXbMSieTu1LkThmkK?= =?us-ascii?Q?nR9OQhI4nGS3MNBrNSmtOIRllAp08Ujeacy6l4pkNR3PUoJZsoV4xUHV2YZ8?= =?us-ascii?Q?1oJ761me2sqgXkG9xcxuyg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f31852b2-8cac-451f-71fc-08d9d2e2b93e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2022 20:09:06.5235 (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: AM6PR03MB5378 Subject: [FFmpeg-devel] [PATCH] avformat/rawvideodec: Disable option accidentally added for v210(x) 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: 41f213c3bf629d549400e935e7f123e6cfa959ab accidentally added an unused pixel_format option to the v210(x) demuxers. Remove it before it really becomes part of the API. Signed-off-by: Andreas Rheinhardt --- libavformat/rawvideodec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index 68547fc50f..3f92211af1 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -126,8 +126,9 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) #define OFFSET(x) offsetof(RawVideoDemuxerContext, x) #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption rawvideo_options[] = { - { "video_size", "set frame size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC }, + /* pixel_format is not used by the v210 demuxers. */ { "pixel_format", "set pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC }, + { "video_size", "set frame size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC }, { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC }, { NULL }, }; @@ -175,7 +176,7 @@ const AVInputFormat ff_bitpacked_demuxer = { static const AVClass v210_demuxer_class = { .class_name = "v210(x) demuxer", .item_name = av_default_item_name, - .option = rawvideo_options, + .option = rawvideo_options + 1, .version = LIBAVUTIL_VERSION_INT, }; -- 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".