From patchwork Thu Nov 30 07:18:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "tiejun.peng" X-Patchwork-Id: 6463 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp299055jah; Wed, 29 Nov 2017 23:21:36 -0800 (PST) X-Google-Smtp-Source: AGs4zMYL0yL3yBkFge7n3JJdcuO4h/kticWubnKxv9UQg5DYIjN9ENUCeWcA014dO1hkezFcj5es X-Received: by 10.223.138.138 with SMTP id y10mr1171066wry.167.1512026496064; Wed, 29 Nov 2017 23:21:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512026493; cv=none; d=google.com; s=arc-20160816; b=mZwtA/dY8NMQEEE/gWOhecYCg30POConfJ+QNugccoIaYw7uFyZ8ThX3EuQaRg82X8 FefHTeYAA2VEL7kZh6EYxJrUOb2NVchp3Ge8jbx55HlPPrecTTfZPNk8c/QJC/PGy/YO jJxGRikk7AQlW9C3rdZGE0mXW2Z1XzpUxuMqEHZoUbcYO1s5t7/o6TYcYUPMbNurqNnE piqbYWzHSLhKycu1UJZFbRRknMSy+xIk5e+EqONdDm9SvG8zuPxQ+mqbZW+Uij9Xn76M 70TUYHieErGaC5s/faKa5rhWvZso6iSCV6OZOksS/n5DGOMJ3FvTqOtixPHbtT3egTib A4ug== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=Lolagt1Uro6QJ3wz2zZAqeap/kG/g0buJt3LH7Fia/E=; b=wWX1M7d0GzKUn/ztdMGLcta/NLf2SdsVzB+Oe+MlRA0nRNPPjBHZ7MHeqsc1eQrrGe eTEF3SLJYIE89EK2MhR36SUOjAAEwPfc4bDSEt6Sejn2Efb45IRPQUBKpNGHfCtdZtaj yb+dDFyOPRSPRKgv+EG4eQHh5Th5QwY+ieb9JeKZADBVQvtFwQmyaacKGsORSprwjifq 70MOIvv3AwuuzpT1jRkn8RccDTN60JbMXdu9KEinRopuRsBtgMMYXnTykAiJTY4ZQEUV fUUtiFtstqWf0Vxlb3+MpW3ztBoqQh3opnmTo+99cTk4j3tN0GJnxT3LK07G4Jo7x8FC cQ1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=OsQ4fAaP; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v195si2588800wmf.11.2017.11.29.23.21.32; Wed, 29 Nov 2017 23:21:33 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=OsQ4fAaP; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B4FF68A29A; Thu, 30 Nov 2017 09:21:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg.qq.com (SMTPBG354.QQ.COM [59.37.110.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FE9768A202 for ; Thu, 30 Nov 2017 09:21:20 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1512026376; bh=blc56bNTqLNqfqQZEKGUBkJSnDm9fYeXoAT/9YvupbM=; h=From:To:Cc:Subject:Date:Message-Id; b=OsQ4fAaPlz5GMnIFGwP4zCEPRmPjIvK343h2ePA6eP8zTNQ0//Pg2nRxNLIHieKaS zSUX3XKGEWcwwSnyfifiOfqbjN2XWzaEP+dFLN6OT9QGcVf18D6ydTnH/JrAPHvxFo Lq2s6ROHfB8dmggqD3V9GmKXBNHcCOCMp9fo0S6Y= X-QQ-mid: esmtp28t1512026375tey0pzmxd Received: from localhost.localdomain (unknown [203.160.89.93]) by esmtp4.qq.com (ESMTP) with id ; Thu, 30 Nov 2017 15:18:52 +0800 (CST) X-QQ-SSF: C100000000000020F3100500000000T X-QQ-FEAT: pJiIyMrDeHvNHgegXYSTPl7mhh+tMeOemr3M3odSrKk+CCuwvpWgIsUY9fu4k VZrP/P/xYdWWEk8eiB00+zRHYj/kTJVZDSjHj1RT0MfM8P4dd0b6/B2YGYx16YSYQ8+nd0y gi8qKgqLkDdeOMnO4tKuCoeMK/Zk8Lg56WtPakGPELgKfarp+FawMKHAVyAUUTTCSCVnpy4 79HsCv5x3FHYfEy0B+O13UgLaQYm6NASaMUZvMnpszHT8/RVgLl6AuJKI29rec0nE6BMZIm 9MNntC8aRFDSQc X-QQ-GoodBg: 0 From: "tiejun.peng" To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Nov 2017 15:18:47 +0800 Message-Id: <1512026327-21890-1-git-send-email-tiejun.peng@foxmail.com> X-Mailer: git-send-email 2.7.4 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign3 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] libavformat/mov:the "stco" box parse no need return eof. 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: "tiejun.peng" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" discard corrupted track and good track have chance to play. Signed-off-by: tiejun.peng --- libavformat/mov.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index c901859..5c2ce39 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1991,8 +1991,10 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->chunk_count = i; - if (pb->eof_reached) - return AVERROR_EOF; + if (i < entries) { + av_log(c->fc, AV_LOG_WARNING, "stream id[0x%x]: corrupted STCO atom\n", st->id); + st->discard = AVDISCARD_ALL; + } return 0; }