From patchwork Fri Dec 8 16:48:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "tiejun.peng" X-Patchwork-Id: 6614 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp765238jah; Fri, 8 Dec 2017 08:49:02 -0800 (PST) X-Google-Smtp-Source: AGs4zMa6dsRBLFuPBPVOJ+8iHFMywEosYCGhz+nYozZW2oFYXy2PMGhiyqd9kzRcDudJGR6w9QS6 X-Received: by 10.223.186.67 with SMTP id t3mr25133496wrg.276.1512751742167; Fri, 08 Dec 2017 08:49:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512751742; cv=none; d=google.com; s=arc-20160816; b=Twx/bHtzzelsQtsKf08sob8b2460FewkMytopEq4BHC8JzBrLmMd+k7y2bnCDQNM0X I1LzLewRSzLfp0GA2e843HCJMSD2Gn1ZLQGxNDKumf5n2kcYXHPKOgSucLN7OZanolJV 1e98RxUdWw4PngI0AmINeDeIYKcPg3v3UNpdYfSP5EwOcTxH52587B5eTKinz+1yJtHg v4JALNvEesnzA3b3pv5Ph3V+F8BCwf/eDT5Frb5MZc8GOrMJjFQ+PVioV10Yc1gvDKpj gWJClyvu4nOBWrccbTngd+DXDocEtMKMHO+Y0WULIPJqXUriq/OkBuk0AcWvLs7csi/h Mj/g== 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=CyjJ0zKATbZ4XBeD/OFgYVFRdGL8HHmZdeVrrhnCdAs=; b=JPZ0x+BgI1ob8xr7IyAhGuEYjfeKhO1AT+CFP6tpCiOmTAzmxnQTqG/ahVNmpJOdI8 g5yEU2iU/EbO7yZYlTf631wLSBGoACT6ZgcB9ByQnOqaHd18ptBRQq/q4ugtotNVQ+YI DuwMAmOyQw56uQFmrBw0KS7FHWruiuZB99hpqn+a9HhuTmAzrqwX1AE/IMArveURgCuU P/UuBtCar9lSf7FGG39yBRa5aae4E1ZgtYIGZaa1xPHjENrValEqfaq9nkzRjaXDimMc FhDIUGHcFEQkuy29uC7sdnF0ET0mvDXzLnp6jnV7yrF6UoJp7G5g44TN9D04o+aBUlBk c9Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=xjmOcJue; 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 r136si1388366wmf.262.2017.12.08.08.49.01; Fri, 08 Dec 2017 08:49:02 -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=xjmOcJue; 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 1E54768A335; Fri, 8 Dec 2017 18:48:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy19.qq.com (smtpproxy19.qq.com [184.105.206.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 838BA6898B7 for ; Fri, 8 Dec 2017 18:48:47 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1512751731; bh=ufD1kl8DF2bWGrPYBZLbrt/LBKA0kQfONxCqTQkCv1I=; h=From:To:Cc:Subject:Date:Message-Id; b=xjmOcJue75DrJFxdBtUIcTzFW/7zKphJKsPCjgIHjFyE/YnTFpSbC6rb+tBUpYqyi 9ethRKts+YiGRacdVq/7EkuNNpbPBLY79HRHaoJQ4wWllo1a3CCtHMBM1tb+qVoaE2 HhOdwXMIBqdwc+gAzIG2A4sFItPPewk+G7tl0nlM= X-QQ-mid: esmtp20t1512751730tnvbnjfff Received: from localhost.localdomain (unknown [120.229.8.48]) by esmtp4.qq.com (ESMTP) with id ; Sat, 09 Dec 2017 00:48:32 +0800 (CST) X-QQ-SSF: C100000000000020F4100F00000000T X-QQ-FEAT: JN+C/NT9bLP6Sbb0Sofdyu8BMDkhKjLF99f3FWuQL4mR+Scr9iAB1deiHNiE1 Av/QPNzwgcjcV85tXgpXETNZ1J9uZ7JPxSEENxs8mMg5QalnnrXriHZOwruGmSnWWWTz7yJ LnOzbR6LmRA6xEEopNUPQ6CTzrm2N3lD44yt+kOpmzbX5lULtCV4SO1WYqqoAHa4rNxLB3o 3WpU1obnk9/3SW0m7hFV1Y6qnXoOBPsiPMxcf0pRhB4GUxx3b+gMLtIyKpV5liWRuBpDAgk ADGJfFXNyZhMw7Q2dKRJyjbaU= X-QQ-GoodBg: 0 From: "tiejun.peng" To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 00:48:03 +0800 Message-Id: <1512751683-8034-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:bgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH V2] lavf/mov: atom box parsing return eof cause play fail 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" fix eof lead to play fail. Signed-off-by: tiejun.peng --- libavformat/mov.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 180b6f4..870fdd6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6632,7 +6632,9 @@ static int mov_read_header(AVFormatContext *s) do { if (mov->moov_retry) avio_seek(pb, 0, SEEK_SET); - if ((err = mov_read_default(mov, pb, atom)) < 0) { + /* EOF don't mean the file to play fail*/ + err = mov_read_default(mov, pb, atom); + if (err < 0 && err != AVERROR_EOF) { av_log(s, AV_LOG_ERROR, "error reading header\n"); mov_read_close(s); return err;