From patchwork Sun Apr 18 21:30:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 26959 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp561770yba; Sun, 18 Apr 2021 14:31:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwA7gLrwhjEwGUGXJLHc/OULH6jPdJ7KhF0JD7Mm5lTp2KvyGoaWGgM9XRhn1zv4RE70bHQ X-Received: by 2002:a17:906:13d6:: with SMTP id g22mr18854833ejc.475.1618781469973; Sun, 18 Apr 2021 14:31:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618781469; cv=none; d=google.com; s=arc-20160816; b=L43RanqqBGbqoklca/sWXbLd+IiWWj/CFpzdvgj9RB32k2zRnFTwhq9YMpUeQ/R66y jEPIoF8MBe0zLkqrv1E8faoLLjWsuaEW1TFwOcIbgFEkwBsu/FfUpjq3LKScavetln/v YY1svbYm5ikIc8LLc9XpvkzbuxV4aH9SYZJWIRf8uxqtEW+j2w8B1dFi9qtJgrZzX6+T m6pdIJDrsT5LgNU0wnzh8/BbBpD7HLyANASJLa7U4+mV6KHOH3KKfgSBzU8PDSzEUbkE 29r2/IPPQCnXMsPwKczI7DEAJlVcyxgKA+kTKQvNgXyyv2KJQj4m5ENdB5UsKxNMUbIO GW5g== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=4Zksyaq6mvWqsSvsGf62E82soZI9zcpzjKXbX6Purk0=; b=yehu/7EalN4eroOs0fq4/jUo+1+A/dwjTokqS1R93sceOoC6Ds63F3KCSA0iCX8QsR Adwxs8Pk7zw5QmGl5NXIiC3rZE4hK2ReMfMBUHldVgwRpChQ+GhVIYAJIltGxVOeemxZ UOJYbUPIqxqyCQJqxYBPPYikVsSDmjgndlYx6E6cPxR6OnkJAT2hC5d8/F9ngo5rMoUN 7sxqN4KZui4HoPe2jg+lDPj4L9dztXSd2eJF083ckw4ipis8AqwAr76JSrWlvF11PrO/ IrRmRVNYpRHzcC6Lc5WUHJ69cknqOzHwZKJBBzq80bvKFt61r5MlxA7OxFcQbzUbcuDt CWhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JrcLwPL3; 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 j24si10056034ejk.65.2021.04.18.14.31.09; Sun, 18 Apr 2021 14:31:09 -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=JrcLwPL3; 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 E4A82680760; Mon, 19 Apr 2021 00:31:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D1086801CD for ; Mon, 19 Apr 2021 00:31:01 +0300 (EEST) Received: by mail-ej1-f51.google.com with SMTP id l4so49848647ejc.10 for ; Sun, 18 Apr 2021 14:31:01 -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:mime-version :content-transfer-encoding; bh=r4bqEAgOZ1S/U7D4r91deKxtlOg39pN/VuC7vasz6os=; b=JrcLwPL3BkY4OOmIoke+ZkV+JMuoqMleNfRwP+RKL9RI8HI23mtE9catM0Q7rLz6DA brFz00ZpbsUpiSzoZma5wSklX16JW/K7XmpXXnz7a7sd7bOkLDJmun4lN62vkdOoij2J am9AUZKz38PfdDcZmwKb3tUqkjjvQe0xp2rnUDXEhA0p5WjXqx37h166UStQ1Y4S/JMX dzou8liqawGBmz45hxML/PDjg0NNpdcm1T6P584FxoaE9VMaNLytQxXD5liRqEm0xjYL mTIc5/fApV2tX6NJls1IcY7Wyh3NJkOX3Wonv37rktsy476pSLM+E+ZcDJMuj+SGL56C UkQA== 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:mime-version :content-transfer-encoding; bh=r4bqEAgOZ1S/U7D4r91deKxtlOg39pN/VuC7vasz6os=; b=bg4E1f3Il+lp8do2nZwD9ewrL7iTEz4T+8gL6pBw9O1Q3inL/thyecYwDMv8eGK5u0 up1DQVBvMN3ubOR2zyOot9zjyOffQIadtHGK4DLEAYyqkeVPtt7xws1d8RUlGzMZ5LGI pckbh0Y0kl+r5I86PmicqVwDieKQtjIYnHj2S2ZfQvuxnywr1LPeZxin0+OD/hmv87QC o3QeY+yWH7UI42al+gXKkba2iL9AiwqMCmkrS6CRGmlL7onS9zKK7U1ZpIN6YFC50V77 3GRGwkAueZTtS3fawMke9AxJStMrBeOO6hA2HXzfEykPKuHe5DG+/Ou9wVW4fFT0Q0xF 710Q== X-Gm-Message-State: AOAM532hSBrQqdHKOQQ7IozNAl6BRAnDky+HurJJg6zlJBx5uuOPkdbx iFLbBYF/axU+BWd55ij2G29qbcmcK3o= X-Received: by 2002:a17:907:760a:: with SMTP id jx10mr19443277ejc.126.1618781460523; Sun, 18 Apr 2021 14:31:00 -0700 (PDT) Received: from mariano (dynamic-adsl-78-14-94-55.clienti.tiscali.it. [78.14.94.55]) by smtp.gmail.com with ESMTPSA id w13sm11020074edc.81.2021.04.18.14.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 14:31:00 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id AD21BBFA60; Sun, 18 Apr 2021 23:30:58 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sun, 18 Apr 2021 23:30:57 +0200 Message-Id: <20210418213058.24475-1-stefasab@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavf/avio: add avio_vprintf() 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: E5swMm/xJ0YZ Content-Length: 3128 This new function makes it possible to use avio_printf() functionality from a function taking a variable list of arguments. --- doc/APIchanges | 3 +++ libavformat/avio.h | 6 ++++++ libavformat/aviobuf.c | 17 +++++++++++++---- libavformat/version.h | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index b41dadee8d..08fec7c234 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-04-18 - xxxxxxxxxx - lavf 58.78.100 - avio.h + Add avio_vprintf(), similar to avio_printf(). + 2021-03-21 - xxxxxxxxxx - lavu 56.72.100 - frame.h Deprecated av_get_colorspace_name(). Use av_color_space_name() instead. diff --git a/libavformat/avio.h b/libavformat/avio.h index d022820a6e..24f6839522 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -571,6 +571,12 @@ int64_t avio_size(AVIOContext *s); */ int avio_feof(AVIOContext *s); +/** + * Writes a formatted string to the context taking a va_list. + * @return number of bytes written, < 0 on error. + */ +int avio_vprintf(AVIOContext *s, const char *fmt, va_list ap); + /** * Writes a formatted string to the context. * @return number of bytes written, < 0 on error. diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 518cb11129..289da796c8 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1196,15 +1196,12 @@ int avio_closep(AVIOContext **s) return ret; } -int avio_printf(AVIOContext *s, const char *fmt, ...) +int avio_vprintf(AVIOContext *s, const char *fmt, va_list ap) { - va_list ap; AVBPrint bp; av_bprint_init(&bp, 0, INT_MAX); - va_start(ap, fmt); av_vbprintf(&bp, fmt, ap); - va_end(ap); if (!av_bprint_is_complete(&bp)) { av_bprint_finalize(&bp, NULL); s->error = AVERROR(ENOMEM); @@ -1215,6 +1212,18 @@ int avio_printf(AVIOContext *s, const char *fmt, ...) return bp.len; } +int avio_printf(AVIOContext *s, const char *fmt, ...) +{ + va_list ap; + int ret; + + va_start(ap, fmt); + ret = avio_vprintf(s, fmt, ap); + va_end(ap); + + return ret; +} + void avio_print_string_array(AVIOContext *s, const char *strings[]) { for(; *strings; strings++) diff --git a/libavformat/version.h b/libavformat/version.h index ced5600034..b6023f9d2e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 77 +#define LIBAVFORMAT_VERSION_MINOR 78 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \