From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id C730E4AB92 for ; Fri, 21 Nov 2025 15:51:34 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'Hj9Q1isXxcIQN5IQnyg0caOLOs74xzEQ+FTYqR1jfho=', expected b'N5FRS0SAYwp5UDk1t+2z4gIxIAsAmq5hrBnMihD/0dA=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763740284; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=Hj9Q1isXxcIQN5IQnyg0caOLOs74xzEQ+FTYqR1jfho=; b=A68+v0zUtOCCZYqlhnLU4055LUWrj3qgwuy27kUpHNc4gYt0BBkvjXPKzXTWwpiUEDktF ddPM1SDG9fsbG1GtbK60Ec4XcriC944pozbhagj5dlj9nsf7tkfUqcwSujI4bj7sB0zFmil ZiXjZOMblobE6deDVudkHOlNK2WcvO95rInGtudoBLzX6vB+qYakiokewj2veTHHGmkTCr4 iQ+ndggesbAQDhf0fCr1TA7Cf/CcTjrKp/it98MBPrk3xZ9ZLku3BY+jw/4Yey3f5/K7EI2 WL0neHR2pBgW5+yETrjtKezfSasNhCgTm2oMS++yMXjq/r6LNtKMakIqYbXQ== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 38BEA68FFFE; Fri, 21 Nov 2025 17:51:24 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1763740282; b=jzHodP28wy0IK/TLs0wg4zqoDyl/t+IWJGxCMp5313p34H4ON2kNgcMs6Umj0YYtGyBBG M5q0tWOM2gimSd5qmAli4ig6v4zPTnEbvR2a3vSaegP313cFUDjcemIYEX0rB5xPmP2Hj42 eqWISD2akK2Bl+q+SPSf86uHwv5LwWLmQfE6oH2eqSqWCEJiLOi6Ni2XHKczXJSWZAbiA5B nQFQlkjT5gsDx4wwvv8bBG5+TiLXTteINIoEvzkNpZp7yXrM0GiHrhUJqE90W1bdIoFypFJ DSTtKDy4+xR6+nWbBI+M2TTisxvCRbhNuaSu1UKPQHF1e6znTcgFEX3oG8Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1763740282; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=d8T3+6d/uC5gv3jhTctb1TUzG3a1Hvvt+yyHBZ31I0M=; b=YrulsdGBHi8SYcueyqbS2mw0tyzyZ3hQOclPRv/zO64wozdZM3tjdaAZj5f72F4HmIqgZ CBx0WsE7ZWfm9z/W16m48JEBNLyJZXnG87+XaKzs7F/LWhFUF8f+BVH7ndH+qi8Zw+Nl3+V g71q/LEfh+KuuH7FjgoiMdlCFWu/+I+smd/OaDK69iwoWQyD1DGAW+LNwVljvE3Ywd09w4O etpo5xHIKIu0M8dyL+rFEcS6ksW4VPEibkxxHHqrX05rqxFM/dsgvOYhWxzadtYRdmgi/G5 /4+lG4l6I0daQaMhLRDg6LN5gvTCsxme+GRbcnGP1GuOtPOwPjSpD6C6j1Ig== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763740274; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=N5FRS0SAYwp5UDk1t+2z4gIxIAsAmq5hrBnMihD/0dA=; b=cmjNhpf7zm5Nz41geYO4aufusyu7J0rJWgeV1LxNoKq7qZJXafdugqFMvl7pcwY9trLhP nF7D8VvxS9hCRZbxsrawS6Vr/VXVUKAZH28IQha5mZa5VD44lnZKqOKJrKYEnicuX4tGZbq BHGruB+M26Hwce0mDKMJU0vM9Y3Kc4Q+zasz/FUGRxOeKDVnTXFHxQfyHgv0rEuJfAMQ/I+ 1dTQOTSgbsBZVfhHj+OEUpO3MTCQnFL6FaN4VWVKu2YyVbriRmLM18wIODPw0dghaooM05A 78SbdiUuhHAu9l+nrmORTBuH6VguKRB8WA4XcRGM5UdhZxY7U5Wja3oAi6/A== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 8373868FF77 for ; Fri, 21 Nov 2025 17:51:14 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Nov 2025 15:51:14 -0000 Message-ID: <176374027469.59.11659825954952602773@2cb04c0e5124> Message-ID-Hash: MGM7WR3S5JA3VS3GXSUTVR5DF4HVAQYX X-Message-ID-Hash: MGM7WR3S5JA3VS3GXSUTVR5DF4HVAQYX X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/oggenc: Schedule pagesize option for removal (PR #20992) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: mkver via ffmpeg-devel Cc: mkver Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20992 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20992 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20992.patch Deprecated in 59220d559b5077c15fa6434e42df95f3b92f0199. (Alternatively we could keep it and no longer claim that it is deprecated.) >>From 52880470ca7860cb32a2915be4583d7091f8a45b Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 21 Nov 2025 15:52:46 +0100 Subject: [PATCH] avformat/oggenc: Schedule pagesize option for removal Deprecated in 59220d559b5077c15fa6434e42df95f3b92f0199. Signed-off-by: Andreas Rheinhardt --- libavformat/oggenc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index e1bb7dd972..9a548a8d29 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -76,7 +76,9 @@ typedef struct OGGPageList { typedef struct OGGContext { const AVClass *class; OGGPageList *page_list; +#if LIBAVFORMAT_VERSION_MAJOR < 63 int pref_size; ///< preferred page size (0 => fill all segments) +#endif int64_t pref_duration; ///< preferred page duration (0 => fill all segments) int serial_offset; } OGGContext; @@ -87,10 +89,12 @@ typedef struct OGGContext { static const AVOption options[] = { { "serial_offset", "serial number offset", OFFSET(serial_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, PARAM }, +#if LIBAVFORMAT_VERSION_MAJOR < 63 { "oggpagesize", "Set preferred Ogg page size.", - OFFSET(pref_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, MAX_PAGE_SIZE, PARAM}, - { "pagesize", "preferred page size in bytes (deprecated)", - OFFSET(pref_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_PAGE_SIZE, PARAM }, + OFFSET(pref_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, MAX_PAGE_SIZE, PARAM | AV_OPT_FLAG_DEPRECATED }, + { "pagesize", "preferred page size in bytes", + OFFSET(pref_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_PAGE_SIZE, PARAM | AV_OPT_FLAG_DEPRECATED }, +#endif { "page_duration", "preferred page duration, in microseconds", OFFSET(pref_duration), AV_OPT_TYPE_INT64, { .i64 = 1000000 }, 0, INT64_MAX, PARAM }, { NULL }, @@ -262,8 +266,12 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st, if (page->segments_count == 255) { ogg_buffer_page(s, oggstream); } else if (!header) { +#if LIBAVFORMAT_VERSION_MAJOR < 63 if ((ogg->pref_size > 0 && page->size >= ogg->pref_size) || (ogg->pref_duration > 0 && next - start >= ogg->pref_duration)) { +#else + if (ogg->pref_duration > 0 && next - start >= ogg->pref_duration) { +#endif ogg_buffer_page(s, oggstream); } } @@ -477,9 +485,6 @@ static int ogg_init(AVFormatContext *s) OGGStreamContext *oggstream = NULL; int i, j; - if (ogg->pref_size) - av_log(s, AV_LOG_WARNING, "The pagesize option is deprecated\n"); - for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; unsigned serial_num = i + ogg->serial_offset; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org