From patchwork Sat Apr 20 13:24:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 48190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp1246188pzb; Sat, 20 Apr 2024 06:25:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKcuFpVzW9F7SwYmc6hjtenIcNKjN0Kdt566hROVwomY9EcBTvrI5JU4POVUDNyiE3s3DZ39grZDdGrjVIpkccnkRI2JcXR39CoQ== X-Google-Smtp-Source: AGHT+IHtiI6C/QYPEvoEJjVjHfrd5/Dgad0vju6OGwNGJBd7akeMZEDIlX4KqtG4WRzLddrQ2+V8 X-Received: by 2002:a17:906:c04e:b0:a52:42e4:96e5 with SMTP id bm14-20020a170906c04e00b00a5242e496e5mr3273923ejb.6.1713619526107; Sat, 20 Apr 2024 06:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713619526; cv=none; d=google.com; s=arc-20160816; b=SCZ0pMvJmqc8fb1aWuhd53dd8xPNUDzBxvDmhYhndVj7GveJJlQ5xFlQHTEDmgG8yw k740u2LAMZi+4A7I73mf3rEXco/SpL+UGV46dNwlz8Gwavli1ieTysjm1biqm2OS4QZX 9P2Ykm3WQLFZQQL7t6Kq7BG8wQkVt3sax2f5qlmYwRlQbXFYzRugdo9Ylw1/1IaX1/be v4t2eTHv3E3eKWnIpB1qkmJnNXz/VUBYTO0EjiMn7hv+BociqS2LNVDBfqSVEIVywk/1 tNhJ1LgEUqLZo3VwiUFKHW5Mf7ak09GAsxC+pFaGd/46z2q1bdsmw3TLfix65ahWoay1 7sKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:delivered-to; bh=oNALM3lXxsc2wmzyVd0mCkuwwNr1vs2yalXLzcLre3g=; fh=73ExZnkQ8FYbu/qeQNmI0dtHCfShNh8/NmZJs1umltM=; b=yh5zL/T+Day1Jdhcb0My4tbBhHPDlYPf79/pbRw/I/23k0lZXJ0n7OX0oN1GhZZCNQ WYKIEG1Si0+8vF4K95qVwuy+aIbYYU07pqjY2dfhPZXrtQ3daklDGpxb2MPqMo11x7ut fBnOBZ0saa86N8oV3AYmXgv9BGyRcFu3raGCrfxAWvBPUvV+lArtWplF3EQ/l6Hv6p1U bA0bxRL8pJ/DpUuAyY8G6d2fG8AZyVU41K44/xsJrlQWKRjnWeyVjDmlXKXBVZ2IwoUg bbhXU/YTCbfcuLqMHcTIAWN7D9pnnT2mG8QC8yfVdnWOXH2S2jR1uedR/iNOT2z+CWMn dyzg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z21-20020a170906241500b00a555ba222c2si3418695eja.966.2024.04.20.06.25.25; Sat, 20 Apr 2024 06:25:26 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 956DB68D216; Sat, 20 Apr 2024 16:25:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78D7868C558 for ; Sat, 20 Apr 2024 16:25:16 +0300 (EEST) Received: from 0.b.4.b.7.4.0.8.c.4.a.5.d.8.b.2.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:2b8d:5a4c:8047:b4b0] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1ryAiR-006woG-38; Sat, 20 Apr 2024 14:25:15 +0100 From: Andrew Sayers To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2024 14:24:59 +0100 Message-ID: <20240420132501.273495-1-ffmpeg-devel@pileofstuff.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/3] avformat/network: add ff_neterrno2() for cases where we already have an errno 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 Cc: Andrew Sayers Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dcQBNrJ9uaph For example, WSAStartup()'s documentation says: "A call to the WSAGetLastError function is not needed and should not be used" --- libavformat/network.c | 5 ++++- libavformat/network.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/network.c b/libavformat/network.c index f752efc411..f295957aa5 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -123,7 +123,10 @@ void ff_network_close(void) #if HAVE_WINSOCK2_H int ff_neterrno(void) { - int err = WSAGetLastError(); + return ff_neterrno2(WSAGetLastError()); +} +int ff_neterrno2(int err) +{ switch (err) { case WSAEWOULDBLOCK: return AVERROR(EAGAIN); diff --git a/libavformat/network.h b/libavformat/network.h index ca214087fc..84348f52a4 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -58,6 +58,7 @@ #define setsockopt(a, b, c, d, e) setsockopt(a, b, c, (const char*) d, e) int ff_neterrno(void); +int ff_neterrno2(int err); #else #include #include @@ -66,6 +67,7 @@ int ff_neterrno(void); #include #define ff_neterrno() AVERROR(errno) +#define ff_neterrno2(ERRNO) AVERROR(ERRNO) #endif /* HAVE_WINSOCK2_H */ #if HAVE_ARPA_INET_H From patchwork Sat Apr 20 13:25:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 48191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp1246261pzb; Sat, 20 Apr 2024 06:25:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXu8z8333Td3WZCJsaThpDNsvDjgdcxjuN7Fsr+N+G7QzAy/YQ8iNRuvX6FVLRvMCmjy/9D7os57DHGPJJ3fm0pWmhxQxUxH6KIQ== X-Google-Smtp-Source: AGHT+IEF/upppCj4Ph+z/DEUViVysqai2ff58v697RJJR9aPq0b0n0iRTGmIWk43zz0LuS5UR0JZ X-Received: by 2002:a17:907:6d1c:b0:a55:a17b:1d44 with SMTP id sa28-20020a1709076d1c00b00a55a17b1d44mr569847ejc.0.1713619534539; Sat, 20 Apr 2024 06:25:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713619534; cv=none; d=google.com; s=arc-20160816; b=ip0sWCwfWDKYgHi9J2BibodipTopW+TCw1866zuAJUne9FdV/N2MvdKrw9RUPPLhvu oSi/yF3WXSTetqouilE2ZIiWlPhM6hpAmMSRNevXT7h6BIGoODwHjUy6ixx8k6bB/bM1 /FIi3l3Gmglr30rUCxfvsCqNO8yP+/yFD6leoiCQXo4ZykCitNRq5JL3x2YwSQT9Nwni gHKiJsE4lH8XpCXGvNqAN25bYLdfrnarhkoxzjE3KFljbPbDuX4FFGq32woBtsxGz+vK l9YGND2kPLgyf3QdhEomw89C0K3eIW525bOEOPpvPQ5kO+z2j97R5Bl0A/79dU3jRnMw Mh7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:delivered-to; bh=0R1IdLXAXshVWcRKIxnyQXuJFFuyhtLEM9oFyecOlCo=; fh=73ExZnkQ8FYbu/qeQNmI0dtHCfShNh8/NmZJs1umltM=; b=u0vQLchM6q+IYXdg76hs007CGFeryg6J5roddSLUjL2YwSnHiSITfWIxxA3kTo9ukf Y/7VWU6syvdANAMeprFQjBWg4w/AlHRNDJ9kXkUxpCWfVJUun1s6QtojjeuZhWY9zlVZ yTikGAMpWtIyekSHUCRhQ/ilC5VvrywmVQql8+ib9XLEKRJdhkAiGMHC0X3utTligPSo yaII3vlh960kTZbhibQz8awcCiZZk+o29K05IBsNjnlK37a2OHdk/ol/hwhwhFjgaJjy FmcPhPdaRM4AA8DARALafESTM0lavLEJ2KaY1xIiNj8e9b/a0YXNbAeRlBOAKt0mKnEM V9BA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n13-20020a1709062bcd00b00a520eb29a92si3544360ejg.438.2024.04.20.06.25.34; Sat, 20 Apr 2024 06:25:34 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96EFD68D1FA; Sat, 20 Apr 2024 16:25:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9158268D1A6 for ; Sat, 20 Apr 2024 16:25:16 +0300 (EEST) Received: from 0.b.4.b.7.4.0.8.c.4.a.5.d.8.b.2.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:2b8d:5a4c:8047:b4b0] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1ryAiS-006woG-0y; Sat, 20 Apr 2024 14:25:16 +0100 From: Andrew Sayers To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2024 14:25:00 +0100 Message-ID: <20240420132501.273495-2-ffmpeg-devel@pileofstuff.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240420132501.273495-1-ffmpeg-devel@pileofstuff.org> References: <20240420132501.273495-1-ffmpeg-devel@pileofstuff.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/3] avformat/network: Return 0/AVERROR from ff_network_init() 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 Cc: Andrew Sayers Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VMTAdDjV8l+L --- libavformat/avio.c | 4 ++-- libavformat/network.c | 7 +++---- libavformat/rtsp.c | 12 ++++++------ libavformat/rtspdec.c | 4 ++-- libavformat/sapdec.c | 4 ++-- libavformat/sapenc.c | 4 ++-- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index d109f3adff..f82edec779 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -123,8 +123,8 @@ static int url_alloc_for_protocol(URLContext **puc, const URLProtocol *up, int err; #if CONFIG_NETWORK - if (up->flags & URL_PROTOCOL_FLAG_NETWORK && !ff_network_init()) - return AVERROR(EIO); + if (up->flags & URL_PROTOCOL_FLAG_NETWORK && (err=ff_network_init())<0) + return err; #endif if ((flags & AVIO_FLAG_READ) && !up->url_read) { av_log(NULL, AV_LOG_ERROR, diff --git a/libavformat/network.c b/libavformat/network.c index f295957aa5..c1b0e69362 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -59,11 +59,10 @@ int ff_network_init(void) { #if HAVE_WINSOCK2_H WSADATA wsaData; - - if (WSAStartup(MAKEWORD(1,1), &wsaData)) - return 0; + return ff_neterrno2(WSAStartup(MAKEWORD(1,1), &wsaData)); +#else + return 0; #endif - return 1; } int ff_network_wait_fd(int fd, int write) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index b0c61ee00a..3db4ed11c2 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1740,8 +1740,8 @@ int ff_rtsp_connect(AVFormatContext *s) return AVERROR(EINVAL); } - if (!ff_network_init()) - return AVERROR(EIO); + if ((err = ff_network_init())<0) + return err; if (s->max_delay < 0) /* Not set by the caller */ s->max_delay = s->iformat ? DEFAULT_REORDERING_DELAY : 0; @@ -2395,8 +2395,8 @@ static int sdp_read_header(AVFormatContext *s) char url[MAX_URL_SIZE]; AVBPrint bp; - if (!ff_network_init()) - return AVERROR(EIO); + if ((err = ff_network_init())<0) + return err; if (s->max_delay < 0) /* Not set by the caller */ s->max_delay = DEFAULT_REORDERING_DELAY; @@ -2522,8 +2522,8 @@ static int rtp_read_header(AVFormatContext *s) AVBPrint sdp; AVDictionary *opts = NULL; - if (!ff_network_init()) - return AVERROR(EIO); + if ((ret = ff_network_init())<0) + return ret; opts = map_to_opts(rt); ret = ffurl_open_whitelist(&in, s->url, AVIO_FLAG_READ, diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 10078ce2fa..3b0829694e 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -663,8 +663,8 @@ static int rtsp_listen(AVFormatContext *s) int ret; enum RTSPMethod methodcode; - if (!ff_network_init()) - return AVERROR(EIO); + if ((ret = ff_network_init())<0) + return ret; /* extract hostname and port */ av_url_split(proto, sizeof(proto), auth, sizeof(auth), host, sizeof(host), diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index 357c0dd514..719c26c6b8 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -70,8 +70,8 @@ static int sap_read_header(AVFormatContext *s) int port; int ret, i; - if (!ff_network_init()) - return AVERROR(EIO); + if ((ret = ff_network_init())<0) + return ret; av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, path, sizeof(path), s->url); diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 87a834a8d8..3305122524 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -80,8 +80,8 @@ static int sap_write_header(AVFormatContext *s) int udp_fd; AVDictionaryEntry* title = av_dict_get(s->metadata, "title", NULL, 0); - if (!ff_network_init()) - return AVERROR(EIO); + if ((ret = ff_network_init())<0) + return ret; /* extract hostname and port */ av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &base_port, From patchwork Sat Apr 20 13:25:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 48192 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp1246304pzb; Sat, 20 Apr 2024 06:25:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWie9WAmhbm3wYjLwJKr39He2PwNhh9XjalImnKD1+mbOiHq935yhAkYAEz3UDtR/Itaq7+MFcJkNABV0Jmkf1N9+aB8GNDHMXg9g== X-Google-Smtp-Source: AGHT+IEeOKbzahHAGXiTLiJKSPCff+9rIoeAwuM5wSFVO2bUS6WJHhdXvirKZ8ing2RCgzgeHaWX X-Received: by 2002:a17:906:2806:b0:a55:8820:e8b3 with SMTP id r6-20020a170906280600b00a558820e8b3mr2733369ejc.19.1713619543232; Sat, 20 Apr 2024 06:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713619543; cv=none; d=google.com; s=arc-20160816; b=XRpHR4vEtKQYTU5fbwJPuTyjpSvOupSewQ1ZcMLrNc6mdOfpsbZAHqwDgRowt9o0ls y5NnHjaGbU2q+C/EsHtuSg0JQi0uPkhM7Kg4kYaXUcAppfsqr/lnmz6j4IxeR871B5so MMbtvYsBevpLOuBkF6Cpa5BTOdNPbd/Q8/JDOYMoU7ygxH5wEf4knXwXLX230HxXHPZz 5D5ovU5jQAKkTAGES5J8LMUr/PHrWRGAd+aYGKRq81ovkUW88kekBb9mZtqWrny6MDcZ 8u/KyL7rjK9xgNx+Hf+gxEfME/UJo03ajJBeSmGtQbFq6GnPOwQ13zA28HY/t2MfmDqE S8zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:delivered-to; bh=qITpzMlyulSxfW28gOqD8EaAWmZ17M8LWriM3gyOPik=; fh=73ExZnkQ8FYbu/qeQNmI0dtHCfShNh8/NmZJs1umltM=; b=FxeYokLLg2fhFYpMZv7Tb73mHqjcxN61ahfpwG1fR5bNuUNifATCr7HAQCLCf5wtEz exZk0cfn+LYiMu5f4T41Axk5jL6gch7OllwxZiTVA8Xlmq66EfuUoGdr0zRpCLFiFNLU aXg1bL0+8dkAJQ7eHsfKzQnquSKSFtdNAHNCKrIcGf6oTxtgOniMq1z4ASkwHXRTS+9h moK5TfOIl+B2a9jwOgH+x6ZSRzC6mXZcHpUubyUX9XSWaB+fhWzrgcINccYbxEeS8Pzl VNuwYf0+ENaAFSB5HpqDMOqXngUpVYarFzUBVPMi+A8GlPbg5VMTe1ZTI6mFy33UBhnb uawQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cb21-20020a170906a45500b00a5555902860si3460353ejb.673.2024.04.20.06.25.42; Sat, 20 Apr 2024 06:25:43 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8EB5068D234; Sat, 20 Apr 2024 16:25:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC68668D1A6 for ; Sat, 20 Apr 2024 16:25:16 +0300 (EEST) Received: from 0.b.4.b.7.4.0.8.c.4.a.5.d.8.b.2.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:2b8d:5a4c:8047:b4b0] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1ryAiS-006woG-2O; Sat, 20 Apr 2024 14:25:16 +0100 From: Andrew Sayers To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2024 14:25:01 +0100 Message-ID: <20240420132501.273495-3-ffmpeg-devel@pileofstuff.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240420132501.273495-1-ffmpeg-devel@pileofstuff.org> References: <20240420132501.273495-1-ffmpeg-devel@pileofstuff.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/3] avformat/avformat: Document return codes for av_format_(de)init 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 Cc: Andrew Sayers Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MgP5gPtivV7C --- libavformat/avformat.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8afdcd9fd0..f624fb1e2e 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1944,12 +1944,16 @@ const char *avformat_license(void); * This function will be deprecated once support for older GnuTLS and * OpenSSL libraries is removed, and this function has no purpose * anymore. + * + * @return 0 for success or AVERROR code */ int avformat_network_init(void); /** * Undo the initialization done by avformat_network_init. Call it only * once for each time you called avformat_network_init. + * + * @return 0 for success or AVERROR code */ int avformat_network_deinit(void);