@@ -959,6 +959,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
AVOptionRange *new_range[3] = { NULL };
int nb_range = 0;
struct dshow_format_info *fmt_info = NULL;
+
r = IAMStreamConfig_GetStreamCaps(config, i, &type, (void *) caps);
if (r != S_OK)
goto next;
@@ -2411,15 +2412,15 @@ static const AVClass dshow_class = {
};
const AVInputFormat ff_dshow_demuxer = {
- .name = "dshow",
- .long_name = NULL_IF_CONFIG_SMALL("DirectShow capture"),
- .priv_data_size = sizeof(struct dshow_ctx),
- .read_header = dshow_read_header,
- .read_packet = dshow_read_packet,
- .read_close = dshow_read_close,
- .control_message = dshow_control_message,
- .get_device_list= dshow_get_device_list,
+ .name = "dshow",
+ .long_name = NULL_IF_CONFIG_SMALL("DirectShow capture"),
+ .priv_data_size = sizeof(struct dshow_ctx),
+ .read_header = dshow_read_header,
+ .read_packet = dshow_read_packet,
+ .read_close = dshow_read_close,
+ .control_message = dshow_control_message,
+ .get_device_list = dshow_get_device_list,
.create_device_capabilities = dshow_create_device_capabilities,
- .flags = AVFMT_NOFILE | AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
- .priv_class = &dshow_class,
+ .flags = AVFMT_NOFILE | AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
+ .priv_class = &dshow_class,
};
Signed-off-by: Diederick Niehorster <dcnieho@gmail.com> --- libavdevice/dshow.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)