From patchwork Thu Mar 25 16:32:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 26610 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 5A40144A98E for ; Thu, 25 Mar 2021 18:40:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E49468A753; Thu, 25 Mar 2021 18:40:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1EB368090B for ; Thu, 25 Mar 2021 18:40:03 +0200 (EET) Received: by mail-wm1-f48.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so1548612wmj.2 for ; Thu, 25 Mar 2021 09:40:03 -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=SpOU2hXPSuAhWnvmMo0cdtVqV0TEvLnYPG+9AuAdnaU=; b=KGTntFkBMrbUISPRwDyfJaQFStd2MxRUATe48ick6pBg/gooZNj/G8YtnPCfsIL6Rw b81/6Q4QezCby7q0SU1u74KmMIrfXQcoYfahRc8uGBZuFRGcizpPAXcE5g25Za7kYU+F bNI0facG49Xa82BYww9c0z9rU47WVrWyEwG/6SBYkl2Aooq3nnoTdDWxPeCS3WWOlCoZ H910k4CLezXHn8L89xG+UzDwZidXDygHIYZ3kymOJzOcFGNAbGRzbuE1yLmqw3pzgmKo kbYhRqD/jYjnOnIJcPJiU1eWvLe2N8Tu/UGPpUs/Gmg6eakZouOYNaYoElkguKDmt9rX JMHg== 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=SpOU2hXPSuAhWnvmMo0cdtVqV0TEvLnYPG+9AuAdnaU=; b=PHCP3avJ5uyidtmz1YHybWngYDoGyBbbvyLTYdXmEHFBAnCBqdTQaM7bsz3up6CpP/ za8+JxYh6NltQA6LnuNk1gjBCbn5WsMbl9gHcgU0RLyDHEDz1tVIr+pp6/3TokkXmxLu 0UgrCctly0seffNCzZnohm3zRkhG+/gk7sBs3yDV9PrJCAVgRy3EL7g7EYDxiWtlN1JL EOn/LzGSsMkc/osrDTkGUL8QRQhh3G3vfvSbbLs66HwS0A2FFOLzaLuCgAer1VrOEDyt hyOBt0hzgrlEkQvbo+gR8PMb+8hjKqsHSePgL5Cyx8WpIi0TY2wqxm6KgLFnp0Pa2tLb BgsQ== X-Gm-Message-State: AOAM531whLZYkiDcItKDBAG5ijwecyBZUYApnQ9GcUvgHLv4SOXCHVMv 6aCFesnz03+IulAMExpdv68mfNirUr4= X-Google-Smtp-Source: ABdhPJxWuVIOYhFxwXcrDGVOf9gNqQbUiqzHnAJI5tIkQXsFhRFXtgklfkHYDN4hwQoj+pSar8GmIQ== X-Received: by 2002:a05:600c:49aa:: with SMTP id h42mr9005654wmp.49.1616689968765; Thu, 25 Mar 2021 09:32:48 -0700 (PDT) Received: from localhost.localdomain ([82.129.110.36]) by smtp.gmail.com with ESMTPSA id l15sm8191333wru.38.2021.03.25.09.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 09:32:48 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Mar 2021 16:32:40 +0000 Message-Id: <20210325163240.450743-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 ovr a network, returning AVERROR(ETIMEDOUT). Signed-off-by: Derek Buitenhuis --- libavformat/mov.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index aef5517c2c..bd78e68c16 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7947,8 +7947,10 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) sc->ffindex, sample->pos); if (should_retry(sc->pb, ret64)) { mov_current_sample_dec(sc); - } - return AVERROR_INVALIDDATA; + } else if (ret64 < 0) + return (int)ret64; + else + return AVERROR_INVALIDDATA; } if (st->discard == AVDISCARD_NONKEY && !(sample->flags & AVINDEX_KEYFRAME)) {