From patchwork Wed Nov 21 15:58:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 11108 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 387E944D362 for ; Wed, 21 Nov 2018 17:59:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B5675689EE0; Wed, 21 Nov 2018 17:59:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A73E689BFE for ; Wed, 21 Nov 2018 17:59:07 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id j10so6237089wru.4 for ; Wed, 21 Nov 2018 07:59:09 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=SpUF2dqX3top4VKuRXvPhEmZasxggg4n201zZxRrHRY=; b=j98q432VXmsiIliueCl/BPQfq00lLFZNZ1P8uj4EZSH14Q0ljD7Dz0EaUAvQEJnh95 92gjrtygCBhSpNRWPna8fFbVL3Rzwr2YoU//XEhLsi2xrWeY/Jq811K/RitmJnKZDgSf f91XzC7Z7gGhpBkCxGktUBRPisDQzmZNwRZQD2SQDlPTly3r/cKRX9s87LREguPiWu6Z qsFCGIWdnoo8XK5+MKfk+Ycez3nRzz5zyLDBEj4ZhEA2t669H5zAxLPco+UtuMjwiR5v kiaJO1rBEwgGIThWIX1b6POHGCJRMBEb5th1DkVces57XGhXcP6FnlI3JI6f6ET7NhoF YkPw== 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:mime-version:content-transfer-encoding; bh=SpUF2dqX3top4VKuRXvPhEmZasxggg4n201zZxRrHRY=; b=bKfE7RTaBIHhoTJyOvfW2b9w3R7w4nH+pOtRVlzG86ZjENNvTsJ/+QQynoylN9O51S 5dVTD0Ckg1e4lnKkjNMGGd4lpTHDnxl15gDPJe4rsg3vKeJH0hZEa0wymq6EXO2fGlCd h/IkubaXVn5AqGkn8GKphae9QG7sfw7mBT5YtDHjfg+J/tD5dCM42LPZgz6Lu4yPzAq2 T7m74l7Ay2Byxru7TcOjXhAVXok0GAv+Qa79Qq9F/VP7p5EGwhnE6Kn6Vj7fg09xSOf2 IiTh/L0BsBYsFCdOhVbBzHoL/WiWv2l7xMG6LW99moYGFb/CvZZzUEsBHjZL5rXxcXPe HOqg== X-Gm-Message-State: AA+aEWZ7TnQyy1X+958KWSFibDmEZ8ug7vwHBt6MuLBfma1ZSIzEWxBD RvxkyGhYeE+rnz14Dcxyi7vnruya X-Google-Smtp-Source: AFSGD/Xl0wF9ElkvdgfCVl7/tWzJPCrpCRpjC8CwfEvsGl+u/EiFoY2zp9UZLnQw9g+ZqM2i0M6SwQ== X-Received: by 2002:a5d:548d:: with SMTP id h13mr6108299wrv.80.1542815949095; Wed, 21 Nov 2018 07:59:09 -0800 (PST) Received: from localhost.localdomain ([81.2.170.96]) by smtp.gmail.com with ESMTPSA id 5sm2157493wmw.8.2018.11.21.07.59.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 07:59:07 -0800 (PST) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Nov 2018 15:58:46 +0000 Message-Id: <20181121155848.201788-2-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121155848.201788-1-derek.buitenhuis@gmail.com> References: <20181121155848.201788-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] fftools/ffmpeg: Don't mangle start time based on discontinuities for FLV 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" As far as I can tell, this isn't valid here sicne FLV may not have added streams yet. Signed-off-by: Derek Buitenhuis --- fftools/ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a12208cce9..3bc42c8ca8 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -4373,7 +4373,8 @@ static int process_input(int file_index) // so we instead do it here as part of discontinuity handling if ( ist->next_dts == AV_NOPTS_VALUE && ifile->ts_offset == -is->start_time - && (is->iformat->flags & AVFMT_TS_DISCONT)) { + && ((is->iformat->flags & AVFMT_TS_DISCONT) + && !!strcmp(is->iformat->name, "flv"))) { int64_t new_start_time = INT64_MAX; for (i=0; inb_streams; i++) { AVStream *st = is->streams[i];