From patchwork Thu Oct 27 06:16:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 1198 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp405419vsd; Wed, 26 Oct 2016 23:16:32 -0700 (PDT) X-Received: by 10.194.142.116 with SMTP id rv20mr5106290wjb.184.1477548992454; Wed, 26 Oct 2016 23:16:32 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b2si6552763wjv.167.2016.10.26.23.16.31; Wed, 26 Oct 2016 23:16:32 -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; 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 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 454D2689E70; Thu, 27 Oct 2016 09:16:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f67.google.com (mail-oi0-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E7D0689E0E for ; Thu, 27 Oct 2016 09:16:19 +0300 (EEST) Received: by mail-oi0-f67.google.com with SMTP id p136so2850973oic.1 for ; Wed, 26 Oct 2016 23:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=dhfGFc5f+YpJxXNYT5w7D5HC45xDWyup0LQxnNd/q64=; b=qMMFD1mXBlVAiRPM74d4vitzMHMIcYdDmQmoFvzSlZbiH6YR2XPKQJ6hRJZxBGPIDp mVr5XUqIN7MZpAGc5fmFDgYQt4uBmz1WShHwq4yS8F7k9F2jMkpqChBR6dx+wMBzR9R2 Z/O2K59RKCSlvXyF8IM43TPJvY9AI126YhUg7b0V3QhPnIAcKnX2/ZQ9DQ2/nly7IqS/ usuzSy7wS2J+QQf2aInVYknnJbvv7lrmjHp5otw32PBMbJf+oWOnHUYYYW8Z4c0lP5YZ wqREXxjrgtas7TJAjigv2ckNCCMv8LJAUETOS8fqxmyYzGX4a1wVOPyEVKrkMmD2TxN4 zhiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=dhfGFc5f+YpJxXNYT5w7D5HC45xDWyup0LQxnNd/q64=; b=JxX34KqZGFKgZaRDjoNWC8nKQfnCq9axKg4DYMLkRD7RptWuhe5FzrP9yMGa5oudaY hlhjwmq5DU18Vt56KL5outWXnxgRpQjaiNnnzkWxKXnBDl5LeO2/06la4DHz6x4kb2Jq 8VB8A/c0JTm/OZXy+ihApRucyImYIC6sFH2y4oLyO15HiJBvlAhcO0hRb/Rn9n/06r6b 1IO3OSgXrAYna/MO+z8MMOHZQhJU0rrh4n9pla/DFjUym6Q0FVqI4s/iOKKYiPXZ17UA p+cR7KyOsuM/xev8suqipyVaYEGlNNC6nZedjD/M2ktUTQZTXXG70gB4eLOjpyrFEmyc H2Xw== X-Gm-Message-State: ABUngvfz6KTtAH44fHkvcqib5eqqfNC0gLZSwhcVMlFGyuYflhXpz1D2oM7BY7czX45HFw== X-Received: by 10.107.180.214 with SMTP id d205mr5584206iof.203.1477548981437; Wed, 26 Oct 2016 23:16:21 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id 65sm479511itg.19.2016.10.26.23.16.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 26 Oct 2016 23:16:20 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Oct 2016 01:16:12 -0500 Message-Id: <20161027061613.44001-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161027061613.44001-1-rodger.combs@gmail.com> References: <20161027061613.44001-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavf/matroskaenc: don't try to modify the header when live-streaming 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/matroskaenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c94a490..4f5948d 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1783,7 +1783,7 @@ static int mkv_write_header(AVFormatContext *s) put_ebml_void(pb, 11); // assumes double-precision float to be written } } - if (s->pb->seekable) + if (s->pb->seekable && !mkv->is_live) put_ebml_void(s->pb, avio_tell(pb)); else end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv, mkv->info); @@ -2274,7 +2274,7 @@ static int mkv_write_trailer(AVFormatContext *s) return ret; } - if (pb->seekable) { + if (pb->seekable && !mkv->is_live) { if (mkv->cues->num_entries) { if (mkv->reserve_cues_space) { int64_t cues_end;