From patchwork Tue Mar 10 16:26:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 18109 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 A1E614482DA for ; Tue, 10 Mar 2020 18:26:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 856366880D1; Tue, 10 Mar 2020 18:26:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3BEF687F7C for ; Tue, 10 Mar 2020 18:26:25 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id b22so5623446pls.12 for ; Tue, 10 Mar 2020 09:26: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:mime-version :content-transfer-encoding; bh=jfQpHtWWn99cmL+4WrApAdD8z18ux7fZ4USHWDyapk4=; b=u2feeiEqs+PeLGQm8Am8bhJRrFZYQ96FFS+a9Qv98VKiGeR4zX4I63DKaD/jz4pBQf Vaj3QjrTdTyfpqhsgWUZHJ5BihuAAAQziGdrOeXhWP1uIILocLq5jKiV+n3Jxj9Lei1B XbsKgdRL00h4ZsdhSVa/hCCzcflLLrZ7wTwlIIEoX5Qaby7oswOjp/SKhY+x5hPCBgd+ JTJJbQuhgbXMZjcxZADCPZXAcLxN454zTueWBCgPsEWXkiEWEd92IrYxDzEaHflId+NH keOJ2kXOkACg8f6z5FWMfEi0H1Habh21Tw8+0Vsr+C9r/9vBmarvfGneX1fd8MtiYGZs JmVQ== 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:mime-version :content-transfer-encoding; bh=jfQpHtWWn99cmL+4WrApAdD8z18ux7fZ4USHWDyapk4=; b=J2Mn7772vMAs/IIilfOLIBC2+56qudmHTZB8MNdXC3KTMA6fmrSjn1y4scrWvROJ72 AtmlN2tdQtLwmApQtNt3d6eVLpzZPVv1q5D9xoxIefHNtDs7RSVKB2gGmG/vQNDjlarP W55vNrBcVbsCdu5Tc1ds5qzVP9jDZQKo0U7zdTBmmr5qqa3ywzoFaxBM2Sgfm//qNzfR YZNy8YGv4rujCDu8LLrnpJinJWKy0A44Nq0meOrpjoCCviUpTNGGpc9REdqR9hTDxyn2 Z3Wx7zE3gVyECW4E+CH4Nzt8oOMSXkQYGpdHo0QPUhmdf2/Iy3DCkyjqXPzQ8czdg3Ep kDGA== X-Gm-Message-State: ANhLgQ39v9VkSMb4qxqHpWRTmUBxEgzIHI37+FIYeLW5vNRqcQX9Basl NrSg29wqNDmBnA7+1CkBVt2E/H1w X-Google-Smtp-Source: ADFU+vsu53PVok8M6QYA6q0AUlMu48odNKUtLXlUhjN+E6S8q0DK4y3PQby5Xhd0srro88E0KRrYpg== X-Received: by 2002:a17:90a:185:: with SMTP id 5mr2455299pjc.157.1583857583899; Tue, 10 Mar 2020 09:26:23 -0700 (PDT) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4001:8e18:4d51:fb1:d54f]) by smtp.gmail.com with ESMTPSA id h2sm46676177pgv.40.2020.03.10.09.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 09:26:23 -0700 (PDT) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Mar 2020 09:26:16 -0700 Message-Id: <20200310162616.39278-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/matroskaenc.c: Check if we can seek before writing the end of the ebml of the segment. 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: Thierry Foucu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 42f21eae8b..cf436f9e3e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2630,7 +2630,7 @@ static int mkv_write_trailer(AVFormatContext *s) avio_seek(pb, currentpos, SEEK_SET); } - if (!mkv->is_live) { + if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) { end_ebml_master(pb, mkv->segment); }