From patchwork Thu Mar 25 16:35:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 26609 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E9B65448548 for ; Thu, 25 Mar 2021 18:36:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0CA268A40E; Thu, 25 Mar 2021 18:36:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76EE86880EF for ; Thu, 25 Mar 2021 18:35:55 +0200 (EET) Received: by mail-wm1-f54.google.com with SMTP id p19so1542339wmq.1 for ; Thu, 25 Mar 2021 09:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=d4cK8m24AUXlI3XWOVPZ0gAR9WCsvs6BG84Q4h0tJmM=; b=VnHRfdZiRbwC79YFsXwHzhKi37/75HsfFUHQoWl/myJUAl/wrysWmqX6iMm1mZYZvY mMegvXqISG92BKvByPMtk2TyhhYw+sV/Z9PX/fLKFgFbNh7SH0Lldf+ZAgTYl8BDbXij m3fcCSbGJDTcHmFx0psFZV2uCBF6I0weHKkI6C2fyJDaUYzW+sW/h4Hj3lcrroWyWiSi jx3Vi975P/7EmFK6Vf5r1LBV3lGtFQslVYoz7MWtdCHnNJ7zxZCLr6u7ZZ+bL2g8KWUT jCaNcWyrxCjuRimV//TZKUoT0JICwqRFMMX3VeeaKqYHnzol+jZjDqmJa/cZoYmH364i nZaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=d4cK8m24AUXlI3XWOVPZ0gAR9WCsvs6BG84Q4h0tJmM=; b=Ncwin6H1umviYcv8B+ikwa9aQ/k7+b+CxQuA79NCezwhyA5iZVw40QpEgVOU8kwUfu YP/GK4L7WSWqco6hrVOWa3OXeegiNKlwmkYUWFmbYyyDRg9nXWgLaSn6rkRtGEkuRABe rCoDEn/Q/uEtRBJP4k2CctOxj6Um2/hDkyP9iMCNG769QBePjqJnfM5r9xPY3mo9lzJv rFVklBPWv0rjl6xpxBKpCqk5pXPZpPZaZmSnUvQUDDzuS+Dc4AGCcW1ZnYG9R1D39wiv q1jP9WvLGfjkyUpbeiow7oZjNI5mOs7fR5Bh+whzujHmgDtHYNNsseJs2J8HHjMLrXea jOVg== X-Gm-Message-State: AOAM532u3D7LbJ3ZzrRrCsaGoyMcBbqLwC91xgxicyAEFg1xEDGJLbzA +Y1u4sWoD6tOVCcEDYrylZ8y1zoT2tk= X-Google-Smtp-Source: ABdhPJzI8UYoRrFhbN7iK8g8fIWuEvddxv6M8LZLzmRHbQriljsOjEmJoRzW+aYYKv0/jjQrMIEnjA== X-Received: by 2002:a05:600c:20d3:: with SMTP id y19mr9080048wmm.146.1616690154738; Thu, 25 Mar 2021 09:35:54 -0700 (PDT) Received: from localhost.localdomain ([82.129.110.36]) by smtp.gmail.com with ESMTPSA id p17sm6543820wmd.42.2021.03.25.09.35.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 09:35:53 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Mar 2021 16:35:42 +0000 Message-Id: <20210325163542.451203-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2] avformat/mov: Properly forward error codes from av_seek 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" This is important, for example, for connection timed out events, when used over a network, returning AVERROR(ETIMEDOUT). Signed-off-by: Derek Buitenhuis --- Sent the wrong version the first time, woops. --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index aef5517c2c..f12f174924 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7947,6 +7947,8 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) sc->ffindex, sample->pos); if (should_retry(sc->pb, ret64)) { mov_current_sample_dec(sc); + } else if (ret64 < 0) { + return (int)ret64; } return AVERROR_INVALIDDATA; }