From patchwork Sat Apr 6 11:10:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 47879 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1471198pzd; Sat, 6 Apr 2024 04:10:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFUzHbOAcyUAEYcHnBukk7Tj1RAH04nuITSsW9RZcHhD+Z1IHTGWuPwM5VRvR4xNkfOkjYzuIe9G+tdGzWkvdvMcvqBGGvO3mgIQ== X-Google-Smtp-Source: AGHT+IFBplnRtoKxt6uw9T8cQbowl333U4B9IHnvlDcsVHh0Ogqx7hy2EHV46eAhf1vcnDHI3wGJ X-Received: by 2002:a17:906:53d2:b0:a50:9190:fe51 with SMTP id p18-20020a17090653d200b00a509190fe51mr3866871ejo.3.1712401826976; Sat, 06 Apr 2024 04:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712401826; cv=none; d=google.com; s=arc-20160816; b=Wn51JTl398IIt9H8vmhf26g0JW7kXBBwIpsd1FDnlp6VdxLCgSLsrRs2eVq0HruiBU 5/Syi/Fvf8jdmmarTXDjDc2LFP5jKTPDP9FHcTgoGcxWzM+t6CjdsWR/CHt6bazY1M8A jDQfyD7IkoLlt935JEoMlukzkqIQR9XBPlcv7enhV1IkM53wnSqCFzjYKL56GXKJEUKj z/wgHNKwDPQ8DOMrCx0G7a2V4ldRQdS03LkjZzUlyr9WQ7y2NeHQVL5D1Kwf+1kt4NWQ HnQABQIacfqAd1dqcilYR2gmMy/JZ7t4tNt3ZDdL3sltafdsj2qZKN1xAjFNuoRKijkM rEsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=+nzj3YdAM1quVcdCG9aEwBSv7oW26kVHi0T20WxRRw8=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=0uQUWuPA8GYuzrg+/6t/xpp9geQxdIEjf028kCEjCA2x4UE+jtaY4De8iiQr2vcp14 dA/EOnQWgVjiDPbziU/2JjaD1O6CU++V5Tt7OWg3yAgJAWw2h+3+skgZY6lX4fyXqV4N cU47mBFDsASNZ9qUyhQ9IaaAbwjnCYqacKiQ/5bo6OFhWziBO4DYx0+PBvow6xei4Sac ZAaLA6VFBu+JUPRiYeslkgwOyZX4/GYeVmuULf1J0bLh97bA+GPcFf5Hnmw/9JyvmfHd s53VfZ91mn4jXa9PhmqKK+HGyw6uwxRZqyKHXD5DXBjNQ9C9khOtvKBx/TAl9IXWbmUC ojoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=J5vvEQOo; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qb6-20020a1709077e8600b00a4652743a2asi1713322ejc.264.2024.04.06.04.10.26; Sat, 06 Apr 2024 04:10:26 -0700 (PDT) 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=@gmail.com header.s=20230601 header.b=J5vvEQOo; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E782F68D07E; Sat, 6 Apr 2024 14:10:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA01868C8C3 for ; Sat, 6 Apr 2024 14:10:17 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a51b4032ac7so93907866b.0 for ; Sat, 06 Apr 2024 04:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712401816; x=1713006616; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=p+quuNLUaiqNlnFVn3yK5qwvL1i19pDrXko/so55EZ0=; b=J5vvEQOoi0dcJmme9Kt/mPDilgN3e1AFtXbFvud/91O5kO48pKI6ixVO1va77jk/3Y 3i4cT4pPmlXmHEToRYu7rND0DP3NISSFV+FB+PmLHGskRGIVdrpvr3znOwB7dN5Y4gmW wpheBjSccK/L20PyasCRzEAe+7/myC/RSsLtuUCaBM9A1/iIzPya7A4/eG92qLQjyyBI 3O4qzumos7eq8iGX81k8KqyppKWqGX0Used1d6Ebovd8jDIY9P2HCMNRsy8LwBwEsrbt zXlwu898a6rU/pOv1qOfVTGAUeRRUvHoHDkOfIGcezSyIX4ojw71kYFhzag7rmeg45ax VmcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712401816; x=1713006616; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=p+quuNLUaiqNlnFVn3yK5qwvL1i19pDrXko/so55EZ0=; b=FhIWeMSdkLOUbzgG7KUvfVg+VoAsKqIsygWMj19/eqnIssCJBr1ecTlueuKJewXJRS IzUZhoZLsp6k1Wh3SJ29NfFV9hrPOZIebZhuYbUvZ3mEBD7cPlI0AncN7bCKIc40TZCU U3FIPIJMo9okJEu8fvSb7ubOlBXlv2HZVBQy2xGFJHw5CdeQkUD/qip1MGJqNpUr/+qY qpv+AlUh7pcX7kyDWQ5WuuWXRNi9gAg9LxUN8xGhiDyfn9dwQzwP7ko/flU+w+A2Uein OZ3QD14gYTR4n226GLrkPGXVCqGQ+sN8t6xWnwb2n7AcChj08uOexUmUnB3p5skn2ou2 7/Pg== X-Gm-Message-State: AOJu0YxtxvShgsyfSS8QaSEcsTDgC+w2e1zOZ84IZtvkgxdZ/jA3rkbK QUqZ9Tj3Ypum/g3PMS+ANETXJA+COiV2Bno4psNPc2CT0iadJXYBHqlrJ9+2 X-Received: by 2002:a17:906:3718:b0:a4e:7130:be14 with SMTP id d24-20020a170906371800b00a4e7130be14mr3800219ejc.18.1712401816265; Sat, 06 Apr 2024 04:10:16 -0700 (PDT) Received: from mariano (host-79-42-51-175.retail.telecomitalia.it. [79.42.51.175]) by smtp.gmail.com with ESMTPSA id bj1-20020a170906b04100b00a449026672esm1899278ejb.81.2024.04.06.04.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 04:10:15 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id ADEE2BFCE8; Sat, 6 Apr 2024 13:10:14 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 6 Apr 2024 13:10:14 +0200 Message-Id: <20240406111014.6916-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/matroskaenc: sort options by name 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rL7DHv6z2Eoy --- libavformat/matroskaenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 566e9f4981..8ebe6e4334 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -3500,20 +3500,20 @@ static const AVCodecTag additional_subtitle_tags[] = { #define OFFSET(x) offsetof(MatroskaMuxContext, x) #define FLAGS AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "reserve_index_space", "Reserve a given amount of space (in bytes) at the beginning of the file for the index (cues).", OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, - { "cues_to_front", "Move Cues (the index) to the front by shifting data if necessary", OFFSET(move_cues_to_front), AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, FLAGS }, + { "allow_raw_vfw", "allow RAW VFW mode", OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "cluster_size_limit", "Store at most the provided amount of bytes in a cluster. ", OFFSET(cluster_size_limit), AV_OPT_TYPE_INT , { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "cluster_time_limit", "Store at most the provided number of milliseconds in a cluster.", OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS }, + { "cues_to_front", "Move Cues (the index) to the front by shifting data if necessary", OFFSET(move_cues_to_front), AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, FLAGS }, { "dash", "Create a WebM file conforming to WebM DASH specification", OFFSET(is_dash), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "dash_track_number", "Track number for the DASH stream", OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, FLAGS }, - { "live", "Write files assuming it is a live stream.", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, - { "allow_raw_vfw", "allow RAW VFW mode", OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, - { "flipped_raw_rgb", "Raw RGB bitmaps in VFW mode are stored bottom-up", OFFSET(flipped_raw_rgb), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, - { "write_crc32", "write a CRC32 element inside every Level 1 element", OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, { "default_mode", "Controls how a track's FlagDefault is inferred", OFFSET(default_mode), AV_OPT_TYPE_INT, { .i64 = DEFAULT_MODE_PASSTHROUGH }, DEFAULT_MODE_INFER, DEFAULT_MODE_PASSTHROUGH, FLAGS, .unit = "default_mode" }, + { "flipped_raw_rgb", "Raw RGB bitmaps in VFW mode are stored bottom-up", OFFSET(flipped_raw_rgb), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "infer", "For each track type, mark each track of disposition default as default; if none exists, mark the first track as default.", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER }, 0, 0, FLAGS, .unit = "default_mode" }, { "infer_no_subs", "For each track type, mark each track of disposition default as default; for audio and video: if none exists, mark the first track as default.", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER_NO_SUBS }, 0, 0, FLAGS, .unit = "default_mode" }, + { "live", "Write files assuming it is a live stream.", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "passthrough", "Use the disposition flag as-is", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_PASSTHROUGH }, 0, 0, FLAGS, .unit = "default_mode" }, + { "reserve_index_space", "Reserve a given amount of space (in bytes) at the beginning of the file for the index (cues).", OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, + { "write_crc32", "write a CRC32 element inside every Level 1 element", OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, { NULL }, };