From patchwork Wed Nov 6 02:49:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16126 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 7E3DE447DB1 for ; Wed, 6 Nov 2019 04:50:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D62168B0B1; Wed, 6 Nov 2019 04:50:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D42568B03F for ; Wed, 6 Nov 2019 04:50:51 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id q70so1654267wme.1 for ; Tue, 05 Nov 2019 18:50:51 -0800 (PST) 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=AyrENwRmQh2H0NoiV/Pxtvy0Bp9/MJBYlnyhvRQIbnQ=; b=e5a9zGc5rweD/eQpfcLVWTQBbFN4GE4o7om9EharZTFl0b3oW73RL/3n4OGFTLDCr3 zxURak7A5LsI0tvQujUFJZaJn4IIKMNqeMLz8qH1ULIiXArsLa4dhtxjo/CihQfVy+eP xGt+qtmh03fodnDvliVG7a0Jo+PhBhgZiP16J83BG34VECoWpRrjeKcXIly5VYeKbf0r zlEp3M0pAP+O1TR5H6k46o6n8HCUKpdWBVlzzd/ug5MvdiKTeJfit52riWEDlRqJ4IDN Oe1LnDtsPCvtEBj3FnKjPGSd/6KusyJT8vKuWwlOdEIlFzc9tNb+E5wzr+a29QQjj5OC Im4w== 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=AyrENwRmQh2H0NoiV/Pxtvy0Bp9/MJBYlnyhvRQIbnQ=; b=Bi/C6Lh8+7qzV3UswD5t6ZQaO2mtHiT8WKK9pO9Y6v7a9CB0yyhgYVAEgsnluTbXOW nzVNPZS6bd96PUxC2Y4FM6SaS5qzgmsw/0EeT1U3htfSaXQtlAXiWjUR4l23OkdRx8Qy 9fxR0PkjaZlK48WWq2BbSXI24wxqDYmb/0vvN9iKRIkMbqVj6OqImqgicALgJE2XLk7p PPY2eQEMj1L74VPBCFtFqrNhj1/8ow8PyanpD+4iwzZgKjshaX9lHGjIhCTQAOf3KXUx vF7b0IK7ghhJ7SPZW9/VfvwZ1PvUkTtAgVYlvAEaUSeYaWztVg+Kt2nST+R9AkDLc/6T Pf4Q== X-Gm-Message-State: APjAAAUbsBwp5G+jZ0LD05xyowHHl9gr465fC0oxkHyhordO04932y51 m3xVX5BtqDyAKeF0weH7+UcRp8D2 X-Google-Smtp-Source: APXvYqxH0epJP9UmN8ItnOogi/s8VYvQB3q7cU6oWLydwqT33Q90cIH94hP4zV+69s9Z18T1OcL0DA== X-Received: by 2002:a1c:4c10:: with SMTP id z16mr308166wmf.24.1573008650701; Tue, 05 Nov 2019 18:50:50 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id l13sm1281710wmh.12.2019.11.05.18.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 18:50:50 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 03:49:13 +0100 Message-Id: <20191106024922.19228-14-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/23] avformat/matroskaenc: Remove outdated comment 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This comment does not account for the fact that the limits on cluster size and duration are configurable by the user since 98308bd4. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index bc94ed53ae..39ad5d1ccf 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2360,8 +2360,6 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) cluster_time = pkt->pts - mkv->cluster_pts; cluster_time += mkv->tracks[pkt->stream_index].ts_offset; - // start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or - // after 4k and on a keyframe cluster_size = avio_tell(mkv->cluster_bc); if (mkv->is_dash && codec_type == AVMEDIA_TYPE_VIDEO) {