From patchwork Mon Apr 19 14:09:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560131iob; Mon, 19 Apr 2021 07:16:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7eiVELo2TB4l7Tf81yPih5WWEYAGz5b3NRtTbgNo8S2rGxPtcYISbQoRDGeBzs0j5fQ3j X-Received: by 2002:a05:6402:2219:: with SMTP id cq25mr9052237edb.60.1618841812967; Mon, 19 Apr 2021 07:16:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841812; cv=none; d=google.com; s=arc-20160816; b=Uo4jqPmF2C6pihPSTo8reZqg0mYqe8n+CnIL6/zhfQdwWXBu9aigRWDvPbqUIO4zt4 +aUtaB0F1SBmwIoMYt0eD6lusrPe89z67ziB2Lee6etb0g8lzlHKZXRFIgk9cTuR8qG1 v8Kb2sH0etyDjVIkGSHWhh+FVoFQaUlsdePkKayNX9+SXrDlgFP7E3hgLOIpjxFnYGQK FX23xql2Ny0nkgQL7sZtU9Samrtp1Wl7n3b2Nm01unrptidNU68GMAeeSsRhvtB5YCfl bWPHETt5903E5HdlLj4fyfxIUwA8ok2nZV7FpkQ7nNxtyUo5fQbTOhsQA67Knx+kyjF2 aU7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ypasK/G35AnBKSK44q7+JtWQSp0tfpkv2dC6kKprK2o=; b=SzX9aA2c58CFOeiAoNZGqEksC0WY6pFhRrlC15AMwHSDZMHiqEzLdMkYOCBXWvrPxm 2mxfsPgdlObXd81ulIBQzCxguTRtsa/3ZY6gkROzbPG07ngJgevaGP2tqWFcw9oerMI4 qOaBakoHdwM4ehV/JhV4Zowu7dfqzkdzwal0fvAKUqidtKo1b9RSD56UesZGdCpTkhXD mRtjkvDXG+4hib7zrbcuAjOhthHWA4J4S7hWtv4oo21gpGYEm8ZHQ7/OCB/L4SmiJxRL L1pXDM8rwNPJR6SFNIxJGDctytvP4iKKGawPIZcpKzg1N64bNr6gSab9a/rgccJ6Gg9u 0B5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VXsUD8sO; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g20si12091881edt.518.2021.04.19.07.16.52; Mon, 19 Apr 2021 07:16:52 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=VXsUD8sO; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C1CD6898E3; Mon, 19 Apr 2021 17:12:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16D12688335 for ; Mon, 19 Apr 2021 17:11:56 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id e13so26002962qkl.6 for ; Mon, 19 Apr 2021 07:11: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:in-reply-to:references:mime-version :content-transfer-encoding; bh=1M8jYLTHQVOZSs3RQHZs/Oy5QYGvIXCUF3TUszvjhxw=; b=VXsUD8sOasaOmcGM8/cW+6C6ibl95H433rIjhWdM6v61rGbSBtvnmukvz9QJkZoy5S Xo1snnHfioogyixFJO8YZxcZN3Ihr1ce2lpyAW0RSrt4O8YjoY99rNErzVz+ZSewK2YY x8ZKIml7BqvaSj1eekIC8qhIPvAYfC2bhOfb44ojnN1pDyRVadjQpLBkKIct0ytwaaVn TzgaSL7N4JQ/n0UWaTEOGEIyKGeSArVO4nKK4OjaGjtloGYqdDQ7kKEFR4/lm5MvpC6G um6l1lEXRt8ZqsRD4JPFyueQ0E2OTbPlwNuMq5adTOBm5cBlanHWo15mSejQJqtiu9Fb TnJQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=1M8jYLTHQVOZSs3RQHZs/Oy5QYGvIXCUF3TUszvjhxw=; b=GSUfXWpT+BE93DP6vpMQHdjv47x2S2V6Tn821IzaK3zSYpMQ2ellndYc2/MPFYvUri +DmXIUKG//TVgQA4bAGcKm4DoI+jAMH+rCsPNtgdbj0iTZAnayPv2u7u0WNTphWFsLah 0HOpUuUEPHpmvmyY2Pzycv3bmOtsHY1CDlfW1kY7Q4vcWuGIchGKSWXkMqfsNCqn/Uov U5BiAeLBAuh9iim03v8va8ljFwoH4E5YfLe+aDR8ejCJzLxpsQ9jGjprLDepAserAUiE MpbcixkYHpdHs1drVFsz+oxEJEnsWBn+4H6ciBPieheLJ5aPZWtJF1IeTuwp/Sbz7KkP TblQ== X-Gm-Message-State: AOAM532UkT5aJ5VqPhxspP2GUYP3V2ao6hMrNttx0zWbjVWGVPpq+yqZ TfiQWB+eedFp0invEvaijM9Bf/3WSLs= X-Received: by 2002:a05:620a:1522:: with SMTP id n2mr6460470qkk.298.1618841514781; Mon, 19 Apr 2021 07:11:54 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:41 -0300 Message-Id: <20210419141024.8174-45-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 44/87] avformat/aviobuf: End grace period of allowing 0 from read_packet X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: yoSnIXYnQZW3 From: Andreas Rheinhardt See a606f27f4c610708fa96e35eed7b7537d3d8f712. Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 7 ------- libavformat/version.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 518cb11129..1ecc7fb095 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -519,14 +519,7 @@ static int read_packet_wrapper(AVIOContext *s, uint8_t *buf, int size) if (!s->read_packet) return AVERROR(EINVAL); ret = s->read_packet(s->opaque, buf, size); -#if FF_API_OLD_AVIO_EOF_0 - if (!ret && !s->max_packet_size) { - av_log(NULL, AV_LOG_WARNING, "Invalid return value 0 for stream protocol\n"); - ret = AVERROR_EOF; - } -#else av_assert2(ret || s->max_packet_size); -#endif return ret; } diff --git a/libavformat/version.h b/libavformat/version.h index 4c186f2915..3e82007383 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_OLD_AVIO_EOF_0 -#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_RTSP_OPTIONS #define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) #endif