[FFmpeg-devel] [PATCH 22/35] avformat: avdevice capabilities API details no longer public

[Diederick Niehorster]

Signed-off-by: Diederick Niehorster <dcnieho at gmail.com>
---
 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, \
-- 
2.28.0.windows.1