generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmdutils: use av_match_name to filter devices

Browse Source 
Device name may be coma-separated list.
Use dedicated funtion to compare.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
This commit is contained in:
Lukasz Marek 2014-12-21 22:42:10 +01:00
parent ea0ac11f1b
commit f463df18bc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmdutils.c
View File

@ -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)
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)
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)
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);
} }