From patchwork Mon Jan 8 02:58:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 7193 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp2148379jaa; Sun, 7 Jan 2018 18:58:40 -0800 (PST) X-Google-Smtp-Source: ACJfBovaImg540IoRhdmOe/JdFJBLC9uZlTcQDhVTJCOJanqlmzbIrwRg5UvfWmg/yKSwdzqZ13g X-Received: by 10.223.176.17 with SMTP id f17mr1727127wra.178.1515380320197; Sun, 07 Jan 2018 18:58:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515380320; cv=none; d=google.com; s=arc-20160816; b=rPiTuIOEbPyAbUEH0cC0e0IMV5iyXg6vIRnT0C4pMWgJ3gn1peKLl+Y3xq7TM7gosn 0Dmy47C4hCB2GJXjpxzNCqLoMeq3GZoYqiSONz7xylMYL8gYw8U3Sh+ayXeUoES5mjmF buO6TROY+4xrxiN4n88kRMtjOF98uSFyE3Hvx4hFQTZJ0e3njo+u16ZaBfWuyjSMKygt 7Ko6VIZXVipx/5sT0CZP8/Q/KtrcGCuM2pPQXr/bHCD4M1TbTbzhXxWmyFebIgwI8fCR 83iO9FKRbu2NrxgNNyzZ1AAyfPsrB9pzBtAvhIisrdp0Ur0+fl7v1bptHxKrZZPEJmu/ /qwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:to:references:message-id :date:in-reply-to:from:mime-version:delivered-to :arc-authentication-results; bh=MT2OoRUSZjNHzqTyrKb5pLnAclxDBENhNCUIuwBLA8A=; b=T1x9jmUMXHlJyOPENa1NURD+ClwikXsr2BdT6lt0lOJ/UWsGPn1AhzhB61Zpf/HVr1 Ghb/j6EO7vC5Kd3K0sWnByhTIEOKEgaKwNln7WD/z6GSs8O4RgJEACyQK+mocZCIvdZN Ov6qxm9s6TwruvpjxKFnA8D/wrJZq3qRzrUs+ueTN/wLQ5kS6vHHPZRVpkB8W9wc/6xo 9hjEMcTwJRRNwSq/KUUApx9sLR/PTG90PCAdCvhannms52wnBVwpiQ0ZUvtgiYGSJdYJ sM9E1pcEHo2gf3F/vBC28QKNbnHW3ZPqPHtOoh/3jQWex4U8chUW3NwD1YfSmczt3KX1 7D9w== ARC-Authentication-Results: i=1; mx.google.com; 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 y195si7071594wmd.98.2018.01.07.18.58.39; Sun, 07 Jan 2018 18:58:40 -0800 (PST) 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; 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 3EE85689FEF; Mon, 8 Jan 2018 04:58:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg202.qq.com (smtpbg202.qq.com [184.105.206.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E0E7689FDB for ; Mon, 8 Jan 2018 04:58:31 +0200 (EET) X-QQ-mid: bizesmtp5t1515380297tbvg26g3f Received: from [192.168.3.21] (unknown [121.69.97.6]) by esmtp4.qq.com (ESMTP) with id ; Mon, 08 Jan 2018 10:57:27 +0800 (CST) X-QQ-SSF: 01100000004000F0FKF0000A0000000 X-QQ-FEAT: FRywArojKxbowXr0OAakRPgo9woBKNMB/nGu8PLIvZzpw3VW8KF8Ao+MJ4f9u GJf/GQgr2NEfh1cSv2FAiI18XikzJp3Zsnb763NlG8TtT/9b+2SAAz3eFT70a6swAWVh74P j2Waco4zKAWsItUknTTaZ+QZsIxm7NpxRbXPcsWFg3h3jZRXwhPt3NrwOBtwXxyrAt3jjaO A+Tb8k0m0j5zSRvfHG0tKsVssuz+4kcxuRoJgOV2G2fP6KoWxzCHfSsGJ9wRShgLI3QZDsj gmfINnbLY6JTEQI9RUoikRrfsZtTTAx2bBoA== X-QQ-GoodBg: 0 Mime-Version: 1.0 (Mac OS X Mail 11.1 \(3445.4.7\)) From: =?utf-8?B?5YiY5q2n?= In-Reply-To: Date: Mon, 8 Jan 2018 10:58:14 +0800 Message-Id: References: To: FFmpeg development discussions and patches X-Mailer: Apple Mail (2.3445.4.7) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: Re: [FFmpeg-devel] [PATCH 5/6] dashdec: Avoid trying to read any segments beyond the last 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: =?utf-8?B?5YiY5q2n?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" > On 8 Jan 2018, at 02:46, Stefan _ wrote: > > > <0005-dashdec-Avoid-trying-to-read-any-segments-beyond-the.patch>_______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >From 277c710159849816bff4e4f5ccd1139348518620 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 5 Jan 2018 14:19:25 +0100 Subject: [PATCH 5/6] dashdec: Avoid trying to read any segments beyond the last --- libavformat/dashdec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 1252d4156..af8ab5f2f 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1505,9 +1505,11 @@ restart: if (ret > 0) goto end; - if (!v->is_restart_needed) - v->cur_seq_no++; - v->is_restart_needed = 1; + if (c->is_live || v->cur_seq_no < v->last_seq_no) { + if (!v->is_restart_needed) + v->cur_seq_no++; + v->is_restart_needed = 1; + } end: return ret;