From patchwork Mon Jun 7 23:04:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28143 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3886435iof; Mon, 7 Jun 2021 16:05:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwM8j9SKBs9xpkrM+ZP6U66JurdJYVa05cwat8boQvxULa/6bY5b0mZybHDyGc6OnWWUptr X-Received: by 2002:a17:906:7203:: with SMTP id m3mr19592089ejk.381.1623107140990; Mon, 07 Jun 2021 16:05:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623107140; cv=none; d=google.com; s=arc-20160816; b=vq0LpJ5UKYQVjgEACIgzQIlzkJbKqgMfx83qK/FQGR49jdge9H9PQLMJ4aNF5yDdAP 3oiZmzCRNHL3wuhn2vL8slQcQew1CpSOmVHuX1NqfQfipHl6U2+7i2737UUWHWf14vqf FgG1TgYFHT3PN5Wp5NIhEfp8zGMaLqfcabFqH3xXw2/ZvSBD/IUxEQ57gdscOfxzs862 7WyEAyEUQatukiV/c27Kfqi3lza8Zzpz8k92ofTgJGo5QAOG0vEXnonVU7K7+D1vuqka z5f1Ws44zU2QsyUx5RgjnGaCNMm+K2wIybSuPmqrR3zdmm5xq2PGynQQMrTNVVC9D3A0 4luA== 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:dkim-signature:delivered-to; bh=2980k7BrwrFkk4jbCO5JieAoAWHdOcJ0rr6+/TlYehU=; b=cfZDibh2hUGKhVLY7UdKflqgFVzBj2wgHBVk+hj/aJOwAskJSYPybsOkH8Fn0FnsPo 9XtqlLExpNpZ7CTvoq5J0wyYXBSpdPbtU7RKSgGPlzwMwiQBklUY2aHVI2eIeHZQsH/1 z7OinMw7w2N49pAinuDMN+vmEUbcSQ5EapUyfDKmnr2dNXCusY3A5aRgAgzxVSyVKO33 8E7cuz1OYnSJ/7DjMNkpdihSkgR1NoVAEYHNySS64rWWmw+vmB7b7FdIVhKmrH/Pltpn l0uXS8NpqH5kO7ewAjirGji274rB52iRG/cEwyNOGaSG8wj4cns9PlqcAk7HJZNUASEj IfqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YvXF8Qdf; 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 b3si14385444ejb.219.2021.06.07.16.05.40; Mon, 07 Jun 2021 16:05:40 -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=YvXF8Qdf; 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 47DDE6808F5; Tue, 8 Jun 2021 02:04:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58886680998 for ; Tue, 8 Jun 2021 02:04:48 +0300 (EEST) Received: by mail-lf1-f43.google.com with SMTP id f30so29026544lfj.1 for ; Mon, 07 Jun 2021 16:04:48 -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=oHVAeKDuucuEIh1/hyHpZLNNwjov342Uy2aNdWG+EeI=; b=YvXF8Qdf1zV8RtKkXewY7Fpf+thTaCy7M68VLovADZ4RqkWg/hx2y3I8YlHdfSv8VE fvOUh5wtsWFxFP05n/Zfy0+HBqyHcrEHcDS+WuSONUyH3HcDygO8ig6Befy5bqvPq7mF 4kpTBxL7prS0CAalN0ni//jSOpX6f1551GiIK2bzF/BYngShch6xHf8fu+0G6FjAuUjf CmMN8DiHuYly+FmzIBiIQ4e4pX5huVFOmueHOnOgD96Mq2ebaDHR44KtgXYB885UfuKv /IhqkMORPQM/hhDwaZw01eBXF/BrTclGZ/DACqANCm6O8DK+Pc0hwYmgmHCcjcqlspIH PONg== 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=oHVAeKDuucuEIh1/hyHpZLNNwjov342Uy2aNdWG+EeI=; b=C2Laf+vUCdUgS6MEucNRPefNUDSZ4vNL5xbAkevbhoo+GqTOfRrbNHIG3TCcPyDb0A eg8n9w891t7h2iH7Tz4NqpUkKYWHgPAkeN6cdGUV9Fwfj6VtWd+N324w5P3qvKCe78MV xkqMUep+RfO2f9yuppacjGbhyC4tLuC3VxuN1M/JMnn1jeoQw870YojlMqJV1mjZd/uZ i4IlGVmgFqhPUdeG2eSEelQcu60zRBMqEZM7ntiWyBZVuNULXr3U4/rR/RtjIBHX/sSZ Ds6qfW0v+F9iCl85adMsvlAE6oYUOGkAzpbBihxJEYBUQyjEgEAja3ei/CRz3XBMTQoV NKoA== X-Gm-Message-State: AOAM530k12Rzfq4R3ZVxmREwhsxg95BCJsMAfiCJ/5MTjTnmS355CeKJ MWTYNZ/H8AZxk27hrDjB+lDo9vG7jPFpbA== X-Received: by 2002:a05:6512:3588:: with SMTP id m8mr13813078lfr.309.1623107087457; Mon, 07 Jun 2021 16:04:47 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id v9sm1999563ljv.131.2021.06.07.16.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:47 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:04:01 +0200 Message-Id: <20210607230414.612-23-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210607230414.612-1-dcnieho@gmail.com> References: <20210607230414.612-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/35] avformat: avdevice capabilities API details no longer public 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6iU6FrdOxlfw Signed-off-by: Diederick Niehorster --- libavformat/avformat.h | 9 ++++----- libavformat/version.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6fd09f52cb..12197465bc 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -319,7 +319,6 @@ struct AVFormatContext; struct AVDeviceInfoList; -struct AVDeviceCapabilitiesQuery; /** * @defgroup metadata_api Public Metadata API @@ -582,12 +581,12 @@ typedef struct AVOutputFormat { * Initialize device capabilities submodule. * @see avdevice_capabilities_create() for more details. */ - int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); + int (*create_device_capabilities)(struct AVFormatContext *s, void *opaque); /** * Free device capabilities submodule. * @see avdevice_capabilities_free() for more details. */ - int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); + int (*free_device_capabilities)(struct AVFormatContext *s, void *opaque); enum AVCodecID data_codec; /**< default data codec */ /** * Initialize format. May allocate data here, and set any AVFormatContext or @@ -763,13 +762,13 @@ typedef struct AVInputFormat { * Initialize device capabilities submodule. * @see avdevice_capabilities_create() for more details. */ - int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); + int (*create_device_capabilities)(struct AVFormatContext *s, void *opaque); /** * Free device capabilities submodule. * @see avdevice_capabilities_free() for more details. */ - int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); + int (*free_device_capabilities)(struct AVFormatContext *s, void *opaque); } AVInputFormat; /** * @} diff --git a/libavformat/version.h b/libavformat/version.h index 6519bba101..13df244d97 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 59 -#define LIBAVFORMAT_VERSION_MINOR 4 +#define LIBAVFORMAT_VERSION_MINOR 5 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \