From patchwork Tue May 14 08:49:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13104 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 3BCB6449A2F for ; Tue, 14 May 2019 11:56:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2522F689A87; Tue, 14 May 2019 11:56:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FE44680983 for ; Tue, 14 May 2019 11:56:26 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id 7so1931559wmo.2 for ; Tue, 14 May 2019 01:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nDyHiTZ/hrIDKFOZShsDY5eJcE7a/aFoXSGZDALNwAw=; b=T/fqEG/uail38ot9C39imdaveSj6YsJibWEzwx8V6HcIAM5Z7lv0u+aw9qsS6no3HW gKTerA9e4yU5WTYFaxAElQJd9utZlahxp2fwI4gJ5CC4Wm51ZB6C1siBChYZTy4UPX2C x1TSNXWKEK7nDkubSb5z4DR7X0jFV594/WoFChDeSLeboP5pKKB7nl80FT4F6dk3Vi+J wFdfk6RYyiOveKfdtUdbbNBOt62H4px7XxS6jgXsja+S7RgCQi7bevv34BOeiL0m8v7f MpYJU7cYNYEbnVybWFU/Ki1Utx5O4AUBch+/QIh/Uv9u1vA5oloSnA+MaNVbamFpJZ16 Eo4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nDyHiTZ/hrIDKFOZShsDY5eJcE7a/aFoXSGZDALNwAw=; b=Zu8tvINoD8+eZ/BXHYxL6H3qzjXB1epRn8yrKgt9xKz+Eq14QhGWqfqDyDtRf8BkUO A8BoGdv+eFaQpUlMEeZ42y0PQgScqi2nUbnYccUj+V37Ea5K5gImva3eFO0r9k1L2ur7 waQXcq7m2rRAgZGYWwygcFQIPcWBTuuyarlt1F+u9217pAi71/2iLlp/QeOOZ8drewxL 001ehLipL9NQFM5apUGdFLQWL2KijvMbLMYM2QsV6+31tmFeLjFM1SXp6IIJUqUTYKjI prgCfEYpv9go3Fn1bGpfOvPxE9SpbrPzZVjEB3/fA3TkiMBPwTo+0fUTXLhMNTmWq2lv f5QA== X-Gm-Message-State: APjAAAWhOjJtox8of/d8b9hhrUMNjDKt4rysYr+9Ja1mDbO4LyoNwuCX sBcGjf8MjoCoTz630fHayj3MPAfl X-Google-Smtp-Source: APXvYqwWIrvqeQJ9j7KTBkCGntu/C1Xmvny0uWJZrf+6YtXcvkgDasxaCc5x9GzOf25hYe0Zp8Hekw== X-Received: by 2002:a1c:21c1:: with SMTP id h184mr1874792wmh.78.1557823851492; Tue, 14 May 2019 01:50:51 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id x5sm15809901wrt.72.2019.05.14.01.50.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 May 2019 01:50:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 May 2019 10:49:49 +0200 Message-Id: <20190514084949.57498-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190514084949.57498-1-andreas.rheinhardt@gmail.com> References: <20190514084949.57498-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/aviobuf: Forward error codes in avio_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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 5c01423a2e..2462b95b16 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -293,8 +293,11 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) (!s->direct || !s->seek)) { while(s->pos < offset && !s->eof_reached) fill_buffer(s); - if (s->eof_reached) + if (s->eof_reached) { + if (s->error) + return s->error; return AVERROR_EOF; + } s->buf_ptr = s->buf_end - (s->pos - offset); } else if(!s->write_flag && offset1 < 0 && -offset1 < buffer_size>>1 && s->seek && offset > 0) { int64_t res;