Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavdevice / avdevice.c

diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 5899640..38110dd 100644 (file)
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -19,19 +19,14 @@
 #include "libavutil/avassert.h"
 #include "avdevice.h"
 #include "internal.h"
-
-#if FF_API_DEVICE_CAPABILITIES
-const AVOption av_device_capabilities[] = {
-    { NULL }
-};
-#endif
+#include "libavformat/mux.h"
 
 int avdevice_app_to_dev_control_message(struct AVFormatContext *s, enum AVAppToDevMessageType type,
                                         void *data, size_t data_size)
 {
-    if (!s->oformat || !s->oformat->control_message)
+    if (!s->oformat || !ffofmt(s->oformat)->control_message)
         return AVERROR(ENOSYS);
-    return s->oformat->control_message(s, type, data, data_size);
+    return ffofmt(s->oformat)->control_message(s, type, data, data_size);
 }
 
 int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToAppMessageType type,
@@ -42,26 +37,13 @@ int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToA
     return s->control_message_cb(s, type, data, data_size);
 }
 
-#if FF_API_DEVICE_CAPABILITIES
-int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s,
-                                 AVDictionary **device_options)
-{
-    return AVERROR(ENOSYS);
-}
-
-void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s)
-{
-    return;
-}
-#endif
-
 int avdevice_list_devices(AVFormatContext *s, AVDeviceInfoList **device_list)
 {
     int ret;
     av_assert0(s);
     av_assert0(device_list);
     av_assert0(s->oformat || s->iformat);
-    if ((s->oformat && !s->oformat->get_device_list) ||
+    if ((s->oformat && !ffofmt(s->oformat)->get_device_list) ||
         (s->iformat && !s->iformat->get_device_list)) {
         *device_list = NULL;
         return AVERROR(ENOSYS);
@@ -72,7 +54,7 @@ int avdevice_list_devices(AVFormatContext *s, AVDeviceInfoList **device_list)
     /* no default device by default */
     (*device_list)->default_device = -1;
     if (s->oformat)
-        ret = s->oformat->get_device_list(s, *device_list);
+        ret = ffofmt(s->oformat)->get_device_list(s, *device_list);
     else
         ret = s->iformat->get_device_list(s, *device_list);
     if (ret < 0) {