From patchwork Fri Apr 27 00:51:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 8662 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp69217jad; Thu, 26 Apr 2018 17:51:58 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqFijCpSbwQdZ1UGDAM54esv0nSQdGXLdQmdrtRGUj30Qxm42BN4W6dBMsbyQOO3zQB4de9 X-Received: by 10.28.106.13 with SMTP id f13mr284621wmc.1.1524790318327; Thu, 26 Apr 2018 17:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524790318; cv=none; d=google.com; s=arc-20160816; b=cY0AmqxhiRhnbJpmv2U59fhE0AGD1qwvBEXtYg/G9DgIf6ssx13iScO6DW3f2IJZ2B 59DX806anu1AmzGZZIVW3OkEcxSWFh0emESAazAgq5g4n0xx89ZIpQObmBlibztB/+1r h5c1jHXRkjOecyxXVPqsG733VkLkfVuMhiS66OkwEvGN8Lp6rfbyiSxlH8+l1PtPCl3o 700qOREl8mPbTXvNhArbWqVj1IGwOQoKl7K/14/+JJhETWcCZhCR5sLFCwf23SaClJI3 DeZTlKSWhoQs7aVYm1xXySWUIHlCLD6c7SsyL9n41cE2rhvjsG6yeCErRztvOh8d+Fne gglA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=tXEAiJcNmeMsrA+bno99pu1Hi/woeChZZBbS2MjP9PA=; b=un085WSMsquMU1bhuxa3EJ/nVvsj1aoNqFW57i+EUUkLx36SrxnqkXIJt/ZiXminuD whFYfFK7XU6XlUhy2+W3AhRl+L15RUH4tYds7SiEdXsGttNxEndHwZzy94rham49y6uF 0w3Po0GJvYCn7ICvVw3ag8fFuOetByLP150YrlWl3HOReaknlL5acOH/8cf38Jm8QAo/ 5kKL1WLo//njitmozveaCrQK0HeNcOgiEVk3WM/1SOn/rnseSEGxiS7UAjL+kH70iya+ bsHe4RfsvI92xU+7A4qct15jYC+iyNZR20QXELVyEAHZYrnhaHoHiR+U6RmmesqjYvn3 edAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ddTZgOMd; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q76-v6si95664wrb.269.2018.04.26.17.51.57; Thu, 26 Apr 2018 17:51:58 -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 header.s=20161025 header.b=ddTZgOMd; 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 sp=QUARANTINE 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 5E59368A627; Fri, 27 Apr 2018 03:51:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 349FB689A95 for ; Fri, 27 Apr 2018 03:51:11 +0300 (EEST) Received: by mail-lf0-f67.google.com with SMTP id j16-v6so259077lfb.7 for ; Thu, 26 Apr 2018 17:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=vsL6FeXP3IirmaKxNC8LxPM/Up51w7PQKc50S14zeJE=; b=ddTZgOMdstsBRiSfznFX2/NrD5fDyh9zNUw84oIlYKfh+YSVXYWjVcUU3M42AT6pGZ 2ePa6Q041cD5gKOUqh27P8nDs2nsMAHRJbeYGuE0qrW9tD5/mS0kNXVB2i4oxl+dduFP q/wKU53c4x19shAeN98TRcYfJMLHJxt7zcTNDXH2vMsKaoteNcg/F9G99zplrIn6q6pR lFKHY2nzDY84qIFrwLCFeXi7uOzrQhjbMoM600covsDotBvr3yfaNIo2eGPMaln4GFHo Yqkud/qHibWBRbTwzmypl7C5UlSWtGodU9BHZsAnukYWeP8YbhQmTOhcELyhLGCFZG5U cfEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=vsL6FeXP3IirmaKxNC8LxPM/Up51w7PQKc50S14zeJE=; b=ofvnpqeRji3EOmKEkde1ih0kbPklwsYMc/M6OVNuGDmru226DJjgEB0DK+NcHz9YBM g0A/7sAxis86A6C6WKDEUSBNk4/zS9mX+gW6zCYFJQlt0mX73iQVQXxJpvTBQjNkCcmK VLihXOZyyaItvYmOFBRNhCglRc96uTd7XMOnCL+clb05SsqGZ5kfcEBQ5VWW6yzEB45W GqaSwHspaNpGKoXz7yPzIFbyom92utx0YRgS5ElTge2R37rUvzxi4yenbH+cGMcOA1Tk zJ9uhnz747Tr7ZFdO5cKTIJcmcPoSnZNoXbwxO9FSiOVUGc9PGl1bjYyFN8OYnW5C4eC JOFg== X-Gm-Message-State: ALQs6tAKRJfOEgWZFkafpb08MkBs5LahjAdStAhPJvHGQbDZ/tPnoWXG bwL3rEDcofHHd1OSLbiknIhmXLV9 X-Received: by 2002:a19:1567:: with SMTP id l100-v6mr127596lfi.114.1524790301359; Thu, 26 Apr 2018 17:51:41 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id m4-v6sm22222lfg.69.2018.04.26.17.51.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Apr 2018 17:51:40 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Apr 2018 03:51:35 +0300 Message-Id: <20180427005137.6220-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427005137.6220-1-jeebjp@gmail.com> References: <20180427005137.6220-1-jeebjp@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/3] lavf/dashenc: don't call flush_init_segment before avformat_write_header 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" From: Rodger Combs Fixes crash when muxing MKV-in-DASH --- libavformat/dashenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 211ef23cb0..4f8f61b704 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1026,13 +1026,6 @@ static int dash_init(AVFormatContext *s) av_log(s, AV_LOG_VERBOSE, "Representation %d init segment will be written to: %s\n", i, filename); - // Flush init segment - // except for mp4, since delay_moov is set and the init segment - // is then flushed after the first packets - if (strcmp(os->format_name, "mp4")) { - flush_init_segment(s, os); - } - s->streams[i]->time_base = st->time_base; // If the muxer wants to shift timestamps, request to have them shifted // already before being handed to this muxer, so we don't have mismatches @@ -1074,6 +1067,13 @@ static int dash_write_header(AVFormatContext *s) OutputStream *os = &c->streams[i]; if ((ret = avformat_write_header(os->ctx, NULL)) < 0) return ret; + + // Flush init segment + // Only for WebM segment, since for mp4 delay_moov is set and + // the init segment is thus flushed after the first packets. + if (strcmp(os->format_name, "mp4") && + (ret = flush_init_segment(s, os)) < 0) + return ret; } return ret; }