From patchwork Tue Apr 17 11:48:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuusei KUWANA X-Patchwork-Id: 8476 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.85 with SMTP id c82csp1880480jad; Tue, 17 Apr 2018 05:19:44 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+MDvptYjTSnOiejXOG+dyDLje1t+FhQpQXGyf/tm5s3RWxEB/lI/hPFHIf4GQRU9I35D05 X-Received: by 10.28.12.17 with SMTP id 17mr827900wmm.75.1523967584243; Tue, 17 Apr 2018 05:19:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523967584; cv=none; d=google.com; s=arc-20160816; b=EbyWIIvEOumr3hb3DusxuXNQCf+OX6QjfIxSif8DmaMnP4Fs1VKrCvDS1ucmpN++ls CR+55Sg4/NBGjqgaYipX5El8V/GM2LGr42rOXgJI6zXtw9jioh/h0PQH2n8c6TtSfGvJ nFAym6ehSPn0CFAYKfPQj12SmFaKEIEN4RMvbiIXHB/aoB6y7E/8Rq6HkA+gmO5lolbS FhQBMxQreSIL4Tc4HIfvcirpZd/pdnXi305vkxYpnCht2BI/xtjyDNECw1k2YYbGmrcn LU8cDCIlJVj0BqjBqSKFjYj+5AcHO6Kkrb6C0fTmPrKCk52V5cn7XhwzgZTXXB0ah4Zt +BCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:mime-version:from :dkim-signature:delivered-to:arc-authentication-results; bh=9ArWWVJ93rgnTwLT5A0DDmajkLGXry4M6509n0vXC8s=; b=hv2sFBCs257CqLaMfRqTV3VwEpXI/s0imsp4K88wi5dckTQI4/WLqkTtw33NQMzXLk Nu005CaqmekN1Q7y+otIOx/TWLirn6vj9xETkq2wd3c0Wpc1xuM3bvy5uZjY9Fu6YCYx XA/0z3p4Fku2Vtepqh5QmdYgmzPcTfbmDXgPVHiU2j6HcjGKG/v20Cc9LN0v+Zk4nDgj 2UV+ebOxx1FfSWNq8HaN5tdjw6jcREbX/DkrBQP5WvLMzv0ocXL/lZfQ9umbobuXvBQp iohEzZQtlReL6SSnzBacLDKOjatjZzlTsimB2DUBbf/iRpDgocIejqJQDtPWwBm5WOHl zYFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kumama-org.20150623.gappssmtp.com header.s=20150623 header.b=LMoNyE89; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p65si6592640wmp.218.2018.04.17.05.19.43; Tue, 17 Apr 2018 05:19:44 -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=@kumama-org.20150623.gappssmtp.com header.s=20150623 header.b=LMoNyE89; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 991966806E6; Tue, 17 Apr 2018 15:19:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 674126806E6 for ; Tue, 17 Apr 2018 15:19:09 +0300 (EEST) Received: by mail-pg0-f65.google.com with SMTP id e13so292654pgq.8 for ; Tue, 17 Apr 2018 05:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kumama-org.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:date:subject:message-id :to; bh=YEKrv4j2LbvvjmLRUF9JP6SQzaj23yEMLztmKJrodA0=; b=LMoNyE89ZIqIxW6b4vF1+GbqwmaDHwjY1gsjyVU6KsxBVxFiM0iQatk0WelOZATL5J GXF/ZEBJ1VdqVDO48A7vxnhgBKoI8RSqmkW0IvuSol2YjrJgHr3CgUn0GZ8lVXwgR/xh uW9d6e0uGLWlWwO07hLbdn7a+z6n2vdlDxGky5jlojk29Ft4dE7vRIeVgDOiXnZMw3E0 Vhud91I4FmHpNB2YXYxOC6Hl9R+vdAsTKmqvAS94RMBY312mA+PLhnC35tqlX1h965aA kVMrz3Fi7hI5SJ5YhFGzR01jVde73kqV3XUVNNFQHuplJzeNAmCNvRFTpe+VdI+Xk2i8 MF9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version:date :subject:message-id:to; bh=YEKrv4j2LbvvjmLRUF9JP6SQzaj23yEMLztmKJrodA0=; b=ebarXkru1tDBFa0KCbg+Di5TAOkmth3fqN4OT22l3L7Y7IoHGcvRxa9NQrFDcHZzKA DTu11QT2AXGhMuOAurtPXpocgLt3DTDibGUwvQFQROTd8haENPQ2F791E4RAvmm9Y7hF qQMOvVLR84bWn085UVLD9yt2fEYmoWG+tHNEgeWTRdol1gOoIilqFF1I1ZCkBaspFJGj C7o7ap6ZWN12PxaIKVpOiTaos5bVLP0tu0kYFjZ/W0VJChhndwhMn45z1la0o2sdXrQX SwiAVTu91AptIDpEC5hy+KXl1xCxoLHulAnBz+5pAsWylssCR5c5FwfRzl6Cj1kGm6I7 QCEw== X-Gm-Message-State: ALQs6tB/lnxjyJwdOQbe07jJMhhUkDzzaW68XB4F9r2UiJBuy+WCjRzs TaqHxX+YCu2vJ8XaCWp9ureQ6fKo4SM= X-Received: by 10.101.101.132 with SMTP id u4mr1556787pgv.260.1523965707966; Tue, 17 Apr 2018 04:48:27 -0700 (PDT) Received: from ?IPv6:2400:2411:1400:1700:11e7:f13c:9aa0:2010? ([2400:2411:1400:1700:11e7:f13c:9aa0:2010]) by smtp.gmail.com with ESMTPSA id b6sm37147735pfm.160.2018.04.17.04.48.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 04:48:26 -0700 (PDT) From: Yuusei KUWANA Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\)) Date: Tue, 17 Apr 2018 20:48:23 +0900 Message-Id: To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3445.6.18) Subject: [FFmpeg-devel] [PATCH] avformat/mpegts: also ignore new stream in PMT while seeking 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" avformat/mpegts: also ignore new stream in PMT while seeking Signed-off-by: Yuusei KUWANA --- libavformat/mpegts.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 37a6aa8..bd75494 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2043,6 +2043,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len pid &= 0x1fff; if (pid == ts->current_pid) goto out; + if (ts->skip_changes) + goto out; /* now create stream */ if (ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES) { @@ -2066,6 +2068,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len } } else { int idx = ff_find_stream_index(ts->stream, pid); + if (ts->skip_changes) + goto out; if (idx >= 0) { st = ts->stream->streams[idx]; } else {