Message ID | CAK=uwuzd5wVW1CS9pauxT4Y-=3puJc6jDH13POSGT35Citjs4Q@mail.gmail.com |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2064428jad; Tue, 15 May 2018 16:12:43 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoQ6KC0AY5HvhelX8nVTH+bherdsSbX5Z0kJw7rifPXejiGiAmra6m1TSdTqlDWJ0Li7ycw X-Received: by 2002:a1c:eb0e:: with SMTP id j14-v6mr8479766wmh.87.1526425962980; Tue, 15 May 2018 16:12:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526425962; cv=none; d=google.com; s=arc-20160816; b=uTxWEtp8GODhaFeXAjpvOjr/KCWLI1ucZg9EDMMbgH3ygfkD33ol6YwU23R20Jz9x8 PyQ8HUwsY5DlkpGllqMbWsgYgqy15FUbp/EqJpSztG/bjDU7RStJtsrJ8wwRcvWkbG3v sv5S+Mhp+IlWee0cK+EvLEjjFq0j12uDDUaZYYLF7FB0O1sL1TuK+7qytTJh43vH2gjf oTMRrDTz/d13bDUM/QR9AVMcCZzQyCtY06YMm72Q2SI4XXrvyVy3pGV2CRVgOjYlmIaq qLvzgwiwfyjlICLPtBgNji9tukXMDe+iclIgk6ikihxRUo1THC/waYOl3RFYSCPQGQ7A Fc2A== 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:from:references:in-reply-to :mime-version:dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=Uca5RpP4hqNSmY7RvuadwDYQOY/UhfCHMIT+2AAMoKU=; b=e9qAp02Qd8iWeBtZCzDDv74I5oIDvEBHU3rJq/47UtYpFozeV08vhbO1RsvonpsmTi xzrhYtaosYmIrfbmM6LTLc90PE5f5WfJhGFKFKV7VK+V6DaF3nsrk3kZIl8ZtdfKzFVu hJCCoSmyEMw7vRlHj6FRTGvCgc5nZD35XFtKDswILDDBX45WYALLStKlKRc3eJCAw2Yv INeiKBLGAVCvuTuX/Y1ohJky6Y0EQ9RkBFeTtkviOJNWmiMt9hg6/8lGE598Mev1DGVO JpNsRWr2nVuzBn2yqw8P77MTCvTrHII/VkbdtjYhvD1yZgEh/PRYOLIzjDmTE2EqOdCH acZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gPqZJnJT; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=sFuUSA2w; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y132-v6si1000169wmy.27.2018.05.15.16.12.42; Tue, 15 May 2018 16:12:42 -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=gPqZJnJT; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=sFuUSA2w; 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 933DF68972B; Wed, 16 May 2018 02:12:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot0-f172.google.com (mail-ot0-f172.google.com [74.125.82.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB7206800B5 for <ffmpeg-devel@ffmpeg.org>; Wed, 16 May 2018 02:11:54 +0300 (EEST) Received: by mail-ot0-f172.google.com with SMTP id t1-v6so2226202oth.8 for <ffmpeg-devel@ffmpeg.org>; Tue, 15 May 2018 16:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=KCIu44VpDZzFXSaZWFa8hluxdrFNfVehgbcaQL6rlxA=; b=gPqZJnJTSCKHspVmj+7WkJR7InNVjfu5w8gzABuoE7TDJ4Ye7n3o6nzgG3VBQ2/Z7z 0YkzDs3I98xlGZVP/aS5BwjrrF3/r2QoEQF1C8NG5PZJuFJ5i7AwzGCjkhVmsFGHBL0+ E+GdRMET50C8W1jf2wktgSH5ikaPRm0ia6yTjJqcE4i0zyIFn3oxMoimFy7fKgMOtFvv K43KNcgrjqTNm/esw36crcFxxe5tTadIJltgg0Q+TzTk1CsUnyN98uvPuinLeFlUCLCa 2I+uUzdMAY2r3+VXLXNDFLyNbeztMpZf+VE1EouAyLOZWiEMnWvlOdjlu2KJKvQmgQ8S +FEg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=KCIu44VpDZzFXSaZWFa8hluxdrFNfVehgbcaQL6rlxA=; b=sFuUSA2wOXGs+/NCJcWV9LVyZKP5j5Arvp/1Ezj4TUPawC4m7VxkO04ckoCN+KmDkv WcjXM4tj0TPqa91lmV4GK7d4zgpcwxK1il4NAIVsk/lAPohNtRDvTzVP+mLYul6L7jlQ LuNXC5u14LMcinwilCViJ0XSx3PncDBIccXfRytd43k7zhEFJDB4rR4sXhMOQCtYA6vw SNZj7COXnT2k22S+J2nuUtInUJd4VcEVXxZ7FEGHq/8PzYm1cM0Tu74fcWRAVLH7fmqZ I4qKo2BVjoFEgZNinNXnAeAnUIXvnbMcG4kt68kxUHmA//jWzKGPBbvHYDCBr3jyP01Z t0Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to; bh=KCIu44VpDZzFXSaZWFa8hluxdrFNfVehgbcaQL6rlxA=; b=ccvvTwhsbsPVigbyjLdMk71JNDQkPx0n/1ee2nJaUcD1VNa4ncOGMqw1dRdTgj5HG9 mHTKTmKW6vrbkcqQrOoB1bSatCaFlIUdOBxxy1/LSEpadDpnHs3C7OPATcwhI+ITb9LB cfEn67gMBHELxzKAyku/jf/xBid1ByrdDeJE18UMfI4BaC6LRcddYIggEd85r3tLALvc HdIfyrOQ28t9t31FrtGFBOE6aPcLzXkAGc7VijFFpS8/6NZlSDPQU8z9PTqbGvG9ByDr 1xd5e+TQxPAclEvRq1XLg7YABI3LGuIno9Dhbo57Al+9gxdaAy7IEorix63gTBUuF9di 3fvw== X-Gm-Message-State: ALKqPwcJDfXeqJf7/TcOFH4CbaRqDdgyXbYChUB6cB4ZvCTW5XUV9VV6 2cL4/LlTlcdHua+LBtd02lSiFmvBNNgaaEYzFUr6HRe4 X-Received: by 2002:a9d:2572:: with SMTP id j47-v6mr11706473otd.280.1526425951412; Tue, 15 May 2018 16:12:31 -0700 (PDT) MIME-Version: 1.0 Received: by 10.201.24.198 with HTTP; Tue, 15 May 2018 16:12:10 -0700 (PDT) In-Reply-To: <20180515192344.66526-1-ffmpeg@tmm1.net> References: <20180515121202.GY20131@michaelspb> <20180515192344.66526-1-ffmpeg@tmm1.net> From: Aman Gupta <aman@tmm1.net> Date: Tue, 15 May 2018 16:12:10 -0700 X-Google-Sender-Auth: GIV-73IQXv-mQNtwbOtjeZrDLbU Message-ID: <CAK=uwuzd5wVW1CS9pauxT4Y-=3puJc6jDH13POSGT35Citjs4Q@mail.gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH v2] avformat/mpegts: add merge_pmt_versions option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <http://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <http://ffmpeg.org/pipermail/ffmpeg-devel/> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <http://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index f16eae3235..3d8e9da66f 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1077,6 +1077,8 @@ static int mpegts_push_data(MpegTSFilter *filter, if (!pes->st) { if (ts->skip_changes) goto skip; + if (ts->merge_pmt_versions) + goto skip; /* wait for PMT to merge new stream */ if (!pes->st)