Commit f463df18 authored by Lukasz Marek's avatar Lukasz Marek

cmdutils: use av_match_name to filter devices

Device name may be coma-separated list.
Use dedicated funtion to compare.
Signed-off-by: 's avatarLukasz Marek <lukasz.m.luki2@gmail.com>
parent ea0ac11f
...@@ -2173,7 +2173,7 @@ int show_sources(void *optctx, const char *opt, const char *arg) ...@@ -2173,7 +2173,7 @@ int show_sources(void *optctx, const char *opt, const char *arg)
if (fmt) { if (fmt) {
if (!strcmp(fmt->name, "lavfi")) if (!strcmp(fmt->name, "lavfi"))
continue; //it's pointless to probe lavfi continue; //it's pointless to probe lavfi
if (dev && strcmp(fmt->name, dev)) if (dev && !av_match_name(dev, fmt->name))
continue; continue;
print_device_sources(fmt, opts); print_device_sources(fmt, opts);
} }
...@@ -2181,7 +2181,7 @@ int show_sources(void *optctx, const char *opt, const char *arg) ...@@ -2181,7 +2181,7 @@ int show_sources(void *optctx, const char *opt, const char *arg)
do { do {
fmt = av_input_video_device_next(fmt); fmt = av_input_video_device_next(fmt);
if (fmt) { if (fmt) {
if (dev && strcmp(fmt->name, dev)) if (dev && !av_match_name(dev, fmt->name))
continue; continue;
print_device_sources(fmt, opts); print_device_sources(fmt, opts);
} }
...@@ -2209,7 +2209,7 @@ int show_sinks(void *optctx, const char *opt, const char *arg) ...@@ -2209,7 +2209,7 @@ int show_sinks(void *optctx, const char *opt, const char *arg)
do { do {
fmt = av_output_audio_device_next(fmt); fmt = av_output_audio_device_next(fmt);
if (fmt) { if (fmt) {
if (dev && strcmp(fmt->name, dev)) if (dev && !av_match_name(dev, fmt->name))
continue; continue;
print_device_sinks(fmt, opts); print_device_sinks(fmt, opts);
} }
...@@ -2217,7 +2217,7 @@ int show_sinks(void *optctx, const char *opt, const char *arg) ...@@ -2217,7 +2217,7 @@ int show_sinks(void *optctx, const char *opt, const char *arg)
do { do {
fmt = av_output_video_device_next(fmt); fmt = av_output_video_device_next(fmt);
if (fmt) { if (fmt) {
if (dev && strcmp(fmt->name, dev)) if (dev && !av_match_name(dev, fmt->name))
continue; continue;
print_device_sinks(fmt, opts); print_device_sinks(fmt, opts);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment