From patchwork Sun Nov 7 10:58:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31318 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:dc01:0:0:0:0:0 with SMTP id b1csp2394411iok; Sun, 7 Nov 2021 02:58:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQ+RYRdywYS1uO35gO4ve5XFBGajMCNxJp/Cbxf8/Z+s5BR280Ulqk3r3IAfDO3Zvnufp5 X-Received: by 2002:a17:906:2ad2:: with SMTP id m18mr85995101eje.64.1636282719980; Sun, 07 Nov 2021 02:58:39 -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 w8si3270338edc.62.2021.11.07.02.58.39; Sun, 07 Nov 2021 02:58:39 -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=fF7zK8Fb; 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 1B9F868A800; Sun, 7 Nov 2021 12:58:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075039.outbound.protection.outlook.com [40.92.75.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4A1568A5E4 for ; Sun, 7 Nov 2021 12:58:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dTEeazq7sq3kF+KWLWufWHDd0kz9KJO/t9Rn5J/0uC2e+2OMR+4WSZ4LfYYQoFXs+Rj0IGyl5pionsoPAlwAK/KB3TZ+wjq2GQCGcwwiXenbM1fGqaFP6A9QbnE01YXhOOxb/nIdf0v1vIUglvqVPMQkt2pufYpWDbTbbSDu/cY0GRJdOUQ6T1NbIAtK/QDAencmiTSdAWedlgSO3OuR2/IpumeFww6ISoQNAhWlIpZICzUwlTsznNtGIzu2+dbv+WRAeBKDLf1VTYcgUHJbgN4uCD+zDYApeXRwxQHRz+NnfXG/IzrWSTEN5HAk8unwzJzF67rIVEm1dxE/8BE1+w== 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=FnZeUjOSqicLNS3nB8E0gMrJU69E5KpQDNW+hS/xzbY=; b=l8WnkZGWTij9PuMntyVZg/HX5ZLQJBUEUIZh0G3UaUGEqdTgbU3mnncbwaVHKUDmSUZXelKK8QGveiz6oK+8QTDPLOYgUEX/wCYz9nWozWUq2RLKAcHoKo2o6drkizUvpFBrOo4/kYKk73GsN+ipZJQ4hpKfojrQjVkN/OGapniKYEeVmjGdLDGyUAYbQZjzxvpQ3pKqIfGKrGReK96fKi98i3R3f4UKBhfm04BB0BW1KNd8b4wQSCGlP4gjnMlRkeV9EVkz0KojPJhYNLhAlVU7ExsUrvvOU4E1EUv5ZdUUNO/X4g6uhVsm40gFhrm1KNWOOrykmGc/gJygwT38Og== 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=FnZeUjOSqicLNS3nB8E0gMrJU69E5KpQDNW+hS/xzbY=; b=fF7zK8Fb++k0JqJh2u7DCFaZNp3pb9tKACz9NPH6tjR8MpGQPUYCQdQruCzepWaKwBKG+BAduh6QkaFWk8mLMrPA/TIs/7m6QI98bIXn4IJh0oz/8EunjKy0t6pr1ukhLw98SLLsOQP9vB/i/hmj+KnLK4AJ78QmdYckUmtCMQ0kUW8yyYsZJoMSgrFpEv4ZcahNbcMac51Iz81bCZ1JCPJHSxbBxQPs4IhH3tJdDu7wfiAOYJ9szPs2FiYAeGyWmfEGgyMdxJ295J3J5ffNPeMqbC6PN2rPPjIog4Jk3C0H0rVMDFnuMxea48cao95m3VASn/CWxoYTg5dddFvCuA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7253.eurprd03.prod.outlook.com (2603:10a6:20b:2e8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Sun, 7 Nov 2021 10:58:26 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.015; Sun, 7 Nov 2021 10:58:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Nov 2021 11:58:19 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [qTy7ABQbV33RCAcOIGBctASNYGqePF/M] X-ClientProxiedBy: AM4P190CA0005.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211107105819.208440-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by AM4P190CA0005.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 10:58:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dae8998d-5300-4f5c-2eb4-08d9a1dd868a X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuP8G0EcB4A2ZAPrq4UrtazFNpdw0E68ahOSh7VZDt7jCGJ530UrGn03LZyFKLXwR+3tN9fs526e7+kiqJ1df4b9gmeSijLlfQDx/jXGUQOYVi2yxG8uFqy+g3turXsFUmHPqK8PRWasb9zoKx/rPmHgFl7lhPCi8j6kFKG5PGKgm/Zfl8vz8Yc7gpPPNqsR69IfF0SgdJYIHZHY9zsOl0BSFmA9ebqC0+De/cg3V8BWvPFJN/5D31C0jZlmA6YQQEtLsOV47tmqey+SkKlHo24YrL8Oba5sfhuNP7KsNkQksnDTZyas9C6+UzYicBuVdKdR4SNVWeRe4PzTT92szBhNhcE4rBAafJRSMMetm/6k8hWCwTxnn2dgHsuDwF+tjOXKi2RWyh8zbkBSsWG+C8geGoNXh5ek1CvAhqP+DACPs2V2nJuei+qbj7F4CSdC7LU9t7vUqsURREijQe/P3yJHz8beX9m7wkGxpZsvPfCRdCjm59Cboq2kHGbIqMKjSOWEClxpSxjSwNeDEWavt13gz40jFuKDmwlQ+dpq4tkF8BC4Q2ppw1RAksiTnkYuDXeynZx9i/CsdqWfn1hTncwDTT1xk1L9QY/GkWGFosSkrwemHwyfXUbjTMz0bo6sQKlhpqV2PhPTPYLKSHs6fFWVh1ck5uKRlsJ+Ss7vY7X4tTHSFQ5dtIxtdXnSQSRd/8ewq7+OAI71nefgPV7dNYx4PYar04W/wsy7MQnQq8O/msSMzoO1f3rYg7Y+QabA75+JjQNIwA3BRqeRuFT6BoK X-MS-TrafficTypeDiagnostic: AS8PR03MB7253: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s7XEoBJ0R9G0zXoe76pHLJQb2jArF4R6i/v3w4arSAmmO3lTnUq+yl00LzOfUz5VCLJFK1hvTAIhz7MscLLkCQNemYZadCDAbUjiwrDMD/f03uCigJrRkXJNMZYZRgL/O3/PAtKfvzuIpqg7lOkSDGs/SEeOmTQ4uZcyp00ds8543aHmT0v0SKutupHPH9K4T0G4pmyXBzqwlTNfdjJs6Wl64z4hhZfIpC3v3uTZhzrre/xgiux7Zn31LJDNssH41jy91sDjYFnvdE9kRz2Tk7e1cZsw+X3Yk2sQO2UrpknQfPircwTI36f9bPS6w6Hw+JJAJV+dxDZFCVKFiA9yccK+JHjoaO2ZXJSGjco5SuvlJfYgE9jNJ9VpoyRY74D68z17/gE4BSUVUYzee1nEv7lMgEpllpDwP3SjJf4RK+s7L3Q447qXefgTa0n0/qmz/wmS08b9Jb5+QvlIpv9m0X8mGngt3X2SB0Z5gi7etzljifTDui1eTyc9AYIEufko6IXj4xeBWcUFtH9iOsqq1rMXTIdhL9bKJn/7tlLl6rU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bogklww2ZPj7Pfx6WYP7Nlb6MXGRvcxmmpEEioGdoh3+42TN5mC5SvNmkI2LXwo5JeX57E9xkLHIOxpJBNNr6ZYMxVCXdQiLx5KAy7PypxCLjGQFL1lvWE+mzrSYu+sxqoiRfdSFhBkPBZqT+M/H01U25ZhS+6rP10LJzKM4Pp7v9d6G955tQvAADK9yM40VbNo9F80dnjh4N8nUnO8y6xcKXkil2GTrmgcGndnraML4pkL+9GDE96WS/55zHWltnjVfylngmNSqK1ocNPulCCf619iFkZoFMkkqPdQs5EIKa1CMNbUO/MRQvNjnFC2pI4OQlHZTFbrMuWOutR/nFS4V3m/uhcmfQN+Aq6duil551HeUuSvvwV+D8QOJ+UiMnAmpvGBDPRiMIOmkaROUcT3hRayl6gOpcw5svlCCU3SIzogatnZjAKIQfnO+6JqZZV3gP9DNUhKy9RLyFE5G1RRfaRJsD6uPYDAwKMYYqa9a3cNqZFRM7TGbUKBNyi4AuMfqObe0X20QI2nYV1rXAEsM+kJgdmoMsTyl36dIVmoyAmx0feqYWAtNuK8+V1JGnxblGZ4LmP3xSP8UfswF8sqEKpSFiULZGxZ61qbI7EqjfFhygkOikjYLjKrZScuLe/t85gA8i9fBf/h5nHpeREXD6vL5eJG/cECdYUDEKXj9iJx368MKHAuavqGg92G5UhcQbJnTSmf4a+0pIAhp1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dae8998d-5300-4f5c-2eb4-08d9a1dd868a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 10:58:26.9092 (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: AS8PR03MB7253 Subject: [FFmpeg-devel] [PATCH] avformat/apngenc: Use UINT16_MAX instead of USHRT_MAX 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: 7G5b2pB37AB/ The latter needn't be 16 bits. Signed-off-by: Andreas Rheinhardt --- Will apply this tonight unless there are objections. libavformat/apngenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index c97c475274..767074ecf3 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -91,9 +91,9 @@ static int apng_write_header(AVFormatContext *format_context) return AVERROR(EINVAL); } - if (apng->last_delay.num > USHRT_MAX || apng->last_delay.den > USHRT_MAX) { + if (apng->last_delay.num > UINT16_MAX || apng->last_delay.den > UINT16_MAX) { av_reduce(&apng->last_delay.num, &apng->last_delay.den, - apng->last_delay.num, apng->last_delay.den, USHRT_MAX); + apng->last_delay.num, apng->last_delay.den, UINT16_MAX); av_log(format_context, AV_LOG_WARNING, "Last frame delay is too precise. Reducing to %d/%d (%f).\n", apng->last_delay.num, apng->last_delay.den, (double)apng->last_delay.num / apng->last_delay.den); @@ -191,7 +191,7 @@ static int flush_packet(AVFormatContext *format_context, AVPacket *packet) if (packet) { int64_t delay_num_raw = (packet->dts - apng->prev_packet->dts) * codec_stream->time_base.num; int64_t delay_den_raw = codec_stream->time_base.den; - if (!av_reduce(&delay.num, &delay.den, delay_num_raw, delay_den_raw, USHRT_MAX) && + if (!av_reduce(&delay.num, &delay.den, delay_num_raw, delay_den_raw, UINT16_MAX) && !apng->framerate_warned) { av_log(format_context, AV_LOG_WARNING, "Frame rate is too high or specified too precisely. Unable to copy losslessly.\n"); @@ -281,9 +281,9 @@ static void apng_deinit(AVFormatContext *s) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { { "plays", "Number of times to play the output: 0 - infinite loop, 1 - no loop", OFFSET(plays), - AV_OPT_TYPE_INT, { .i64 = 1 }, 0, UINT_MAX, ENC }, + AV_OPT_TYPE_INT, { .i64 = 1 }, 0, UINT16_MAX, ENC }, { "final_delay", "Force delay after the last frame", OFFSET(last_delay), - AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, USHRT_MAX, ENC }, + AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, UINT16_MAX, ENC }, { NULL }, };