From patchwork Tue May 5 14:45:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vectronic X-Patchwork-Id: 19511 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 50911448588 for ; Tue, 5 May 2020 17:45:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3922268BF91; Tue, 5 May 2020 17:45:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4540168BEA9 for ; Tue, 5 May 2020 17:45:25 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id k12so2596769wmj.3 for ; Tue, 05 May 2020 07:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0AlzN6oL3M7f5HxaddE0iqQf9wLUXU2rEpvaXm8R6tw=; b=lI8fUDtjV/TfGSAmOwvwUndwqZ7pD6j+ZGgbcjeY7iI1fPsTQmBTmEftXJ9JRGmm9Z WEPV5xIDSHHCefHQPWtxe7tnDdorYHo7FTBqHB1GRpB2I2GqSRrjXihGIOO7SlrVLQst bj71uxTxFfHfwWd3ZuPzzKh58wNs+tsjlH/1CnVqCysN/ETXD/elx0bfgmBumGUrTaTJ lEllLZBN8O7oEv/w51rIbJMEJXj7AhIZ+hTRqBPlzMY2BDzosIgXHrn1hPqd4cyEHZ8U 2CMyff7Gfvxu5C7klBWvk5wGRsEXIwATAEdcIo4ELTy/ysdWHia5vPO67S+egVXX419f j2dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0AlzN6oL3M7f5HxaddE0iqQf9wLUXU2rEpvaXm8R6tw=; b=qKXAJczJBvf1F6/dS7l7hDSHykNzDgKtK7pZZolTUj9uXyxH7MxqxyBsF+XYOGPBlf 4tEu9ryq6Ncy9dwuNp16m5xra0m5cmLWZUO8lwP7N4bD9VfXgYpa4IzEKwTGWq3w7Aoi BHHdihqJfhgIMkvmsb9APMvrJPxURUpwoRYPMy0eMlbG//oSTjDbKN7ixyXwMt14hfMo iLag6q+TL3Om+6oie9oZaPfcbBAowQnQGdpt9pbVWTjgs4xvAdqrpWNplgA40P7RwfFE zM1JRndhxTN3rgSTNKVKd9e6EodFNhaS4YSLDipJK+duo953yDZ31lOFxc649WRIdSDB zijw== X-Gm-Message-State: AGi0PuYXnvL9IqknaQecrmMN6upERVTnrO0NQO9M46vgKSP8oksRbKnP O2iLLd3MpYy9fRmVVYq/YVGgu4GdNu0= X-Google-Smtp-Source: APiQypJY5HRytEh44bQFJTFV7Qzu5XASSn2VZnfzoYXH1Ymd8RxlVkOordqE+pgoJjVi5/gCZ58ELA== X-Received: by 2002:a05:600c:20f:: with SMTP id 15mr3862575wmi.71.1588689924409; Tue, 05 May 2020 07:45:24 -0700 (PDT) Received: from mechagodzilla.chapatronic.net (cpc76904-dals22-2-0-cust471.20-2.cable.virginm.net. [81.106.45.216]) by smtp.gmail.com with ESMTPSA id h6sm4289016wmf.31.2020.05.05.07.45.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 May 2020 07:45:23 -0700 (PDT) From: vectronic To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 May 2020 15:45:16 +0100 Message-Id: <20200505144516.6458-3-hello.vectronic@gmail.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) In-Reply-To: <20200505144516.6458-1-hello.vectronic@gmail.com> References: <20200505144516.6458-1-hello.vectronic@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 2/2] avformat movenc extend video_track_timescale flag range to allow use of video stream timescale for track X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: vectronic Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" indent Signed-off-by: vectronic --- libavformat/movenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bcc0ab4377..989ba5b857 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6461,11 +6461,11 @@ static int mov_init(AVFormatContext *s) } else { track->timescale = st->time_base.den; if (mov->video_track_timescale != -1) { - while(track->timescale < 10000) - track->timescale *= 2; - if (track->timescale != st->time_base.den) - av_log(s, AV_LOG_DEBUG, "Stream timescale was low (%d), the track timescale has been forced to %d.\n" - "Specify -video_track_timescale -1 to prevent this.\n", st->time_base.den, track->timescale); + while(track->timescale < 10000) + track->timescale *= 2; + if (track->timescale != st->time_base.den) + av_log(s, AV_LOG_DEBUG, "Stream timescale was low (%d), the track timescale has been forced to %d.\n" + "Specify -video_track_timescale -1 to prevent this.\n", st->time_base.den, track->timescale); } } if (st->codecpar->width > 65535 || st->codecpar->height > 65535) {