From patchwork Fri Mar 29 08:35:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47642 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1850769pzb; Fri, 29 Mar 2024 01:35:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXIgP0qiw4hrMpAf3zPlO1dsQ3h6Ywh4Q9LLG5jNFKt5KewBsgaxlFdI2fzIOYVeS4dct9hVk/Qct1OiNLg+r8znredm99CsINOWg== X-Google-Smtp-Source: AGHT+IFXLzXKM63HlKrbMkSZORPhFfi2uq1dpyhIJMBuUiWqITy04gLFgV8+X7M8AFEyTjQ9Z+4y X-Received: by 2002:a05:6402:445:b0:56d:b745:cff8 with SMTP id p5-20020a056402044500b0056db745cff8mr62410edw.4.1711701359059; Fri, 29 Mar 2024 01:35:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711701359; cv=none; d=google.com; s=arc-20160816; b=u5ACczAuYbkRN5h90mtre2k3Hsugoh93mYN11YnimGHkw3OWnqeYmEBAdrufc5wFgI 5pDJhYKRW+qfqqRgwB/bCTg11JHOkoBy5mhagHSCqvb2G+9IoIuDlTN9qIcPCQd6nhQH 49oSZAZZGlwvsSsX+vI6CwF10yg3UY5XfmuSDaCoAMjwfjeDJBupuSfAbtFxSURXfMgK 0kdt+hOKrxSNz5CkBZO1pFbUFEf213qMCNmuquCb1jzdqPsHxejqtyySfXKNtZp5kjgq UoZIjgIgWx9A+kDmUQMRSEVZ/s1db+HlrYviSDVuR/yM9l+aHOCP/8r8laFXMEhw4DwK yL8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=bbJwsR70bjS5YzoeZDFoWNRK7iQ3q1sBng0GU3sL6wE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=kNXa8lDLyKaKtBHkCIcWoXWjBHy4xVXR4FJm54sfK8rvstwyNw5oc2cNbjB7fiYomL 8WggLHtQv5CmW9zvKf10MXgyD7qgzzSoC868gZRlUxKGmpZqC2Z6RQ15VZNhpJNZuwyt CdsggY2TMSgyKDRvcHNBO+Tw6zA3zPItNCUJzehYE7P31yN6yP2zhEXZ/f6xtXQRmyLK wGttKel2nhL3Ez3rTE1slDKjxPmKQyJMFwaw9ndzjNuTpYZNezErd1WbXuOr2x2lEI3A hedXO1NwO+dqhM1rKEHJi/nlA6T/IUYrsHznb0s0rU0Z3R84J7YOJRc8DCdzR9hxWq1o lR5w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=gI6OAq0M; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i18-20020a05640242d200b0056c18b21900si1657876edc.643.2024.03.29.01.35.51; Fri, 29 Mar 2024 01:35:59 -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=@khirnov.net header.s=mail header.b=gI6OAq0M; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 95A9968D627; Fri, 29 Mar 2024 10:35:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0B2E68D52B for ; Fri, 29 Mar 2024 10:35:40 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=gI6OAq0M; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 1EF5B4D58 for ; Fri, 29 Mar 2024 09:35:40 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id dl0NKmDBI232 for ; Fri, 29 Mar 2024 09:35:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711701339; bh=Xl1eqBLJ8uctzyFXVP2CGMOQzcKmGvwU29UhoLkiVMY=; h=From:To:Subject:Date:From; b=gI6OAq0MB3nj81vVq818gmyMmNQUuQjpwVq145NEjdmdoGgJ7/+2ES15RAGJqniBj XZ01PPnLM5dmKKGXQLqbTK1O9d9/PclaCgXldI701uKMz0kVsOKU4WW4IFbwDXTJXQ 2BbK+OodtaFnzWn0TTl55MZNU1gJOa4zIOrbiwoCu0kvPY59kMRyrK7rtSqlBlwvNL o/O4xwbrMT4TDD5s5MdIV5y7+rAB/kh30r2eFpmlIKG+ncbuBvajiNCAr530FUekze JQqf959L33QHI0HlaecvB2jzMaplqvS0YRNtIrevwuiakjtcwjLgQGEkoC2zq5gsbl QgTNbP6cWWBzw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id F0ADF4CFF for ; Fri, 29 Mar 2024 09:35:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E03263A0357 for ; Fri, 29 Mar 2024 09:35:31 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 09:35:09 +0100 Message-ID: <20240329083509.10130-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/movenc: mark mov/mp4 as supporting VFR 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sTz+hBCys+0C --- libavformat/movenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b97c479cc4..30cfbf6e74 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -8230,11 +8230,11 @@ const FFOutputFormat ff_mov_muxer = { .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, .deinit = mov_free, + .p.flags = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS #if FF_API_ALLOW_FLUSH - .p.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, -#else - .p.flags = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE, + | AVFMT_ALLOW_FLUSH #endif + , .p.codec_tag = (const AVCodecTag* const []){ ff_codec_movvideo_tags, ff_codec_movaudio_tags, ff_codec_movsubtitle_tags, 0 }, @@ -8282,11 +8282,11 @@ const FFOutputFormat ff_mp4_muxer = { .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, .deinit = mov_free, + .p.flags = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS #if FF_API_ALLOW_FLUSH - .p.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, -#else - .p.flags = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE, + | AVFMT_ALLOW_FLUSH #endif + , .p.codec_tag = mp4_codec_tags_list, .check_bitstream = mov_check_bitstream, .p.priv_class = &mov_isobmff_muxer_class,