summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki@gmail.com>2014-02-16 20:06:23 +0100
committerLukasz Marek <lukasz.m.luki@gmail.com>2014-02-16 20:07:08 +0100
commit81c3f81d6f11bf1dad9c6f3de5938e665447b991 (patch)
tree68bdd8e0804413e940f1a473c3900b4ac1bf2a68 /libavformat
parentd3cf9b24cf80eb4d317964e887c591809a149cef (diff)
lavd: add list devices API
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h12
-rw-r--r--libavformat/version.h4
2 files changed, 14 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 2667b37b5c..c990ad60e9 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -261,6 +261,7 @@
struct AVFormatContext;
+struct AVDeviceInfoList;
/**
* @defgroup metadata_api Public Metadata API
@@ -523,6 +524,11 @@ typedef struct AVOutputFormat {
*/
int (*write_uncoded_frame)(struct AVFormatContext *, int stream_index,
AVFrame **frame, unsigned flags);
+ /**
+ * Returns device list with it properties.
+ * @see avdevice_list_devices() for more details.
+ */
+ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
} AVOutputFormat;
/**
* @}
@@ -651,6 +657,12 @@ typedef struct AVInputFormat {
* Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
*/
int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+
+ /**
+ * Returns device list with it properties.
+ * @see avdevice_list_devices() for more details.
+ */
+ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
} AVInputFormat;
/**
* @}
diff --git a/libavformat/version.h b/libavformat/version.h
index 9e7bcf798f..9f0695c86d 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,8 +30,8 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR 32
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MINOR 33
+#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \