History

Merge commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319'

* commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319': vf_libopencv: switch to an AVOptions-based system.

Michael Niedermayer committed 13 years ago

Commit 94ec7092 parents f780a90 ee0e8d43 files · +45 −23Browse files

Showing the changes to libavfilter/avfilter.c (1 of 3 files). Show all

Unified · Split

libavfilter/avfilter.c+5−2
@@ -671,6 +671,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 670 unmodified lines
671671 !strcmp(filter->filter->name, "frei0r_src") ||
672672 !strcmp(filter->filter->name, "gradfun" ) ||
673673 !strcmp(filter->filter->name, "hqdn3d" ) ||
674+ !strcmp(filter->filter->name, "ocv" ) ||
674675 !strcmp(filter->filter->name, "format") ||
675676 !strcmp(filter->filter->name, "noformat") ||
676677 !strcmp(filter->filter->name, "resample") ||
@@ -730,7 +731,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 53 unmodified lines
730731 } else if (!strcmp(filter->filter->name, "format") ||
731732 !strcmp(filter->filter->name, "noformat") ||
732733 !strcmp(filter->filter->name, "frei0r") ||
733− !strcmp(filter->filter->name, "frei0r_src")) {
734+ !strcmp(filter->filter->name, "frei0r_src") ||
735+ !strcmp(filter->filter->name, "ocv")) {
734736 /* a hack for compatibility with the old syntax
735737 * replace colons with |s */
736738 char *copy = av_strdup(args);
@@ -742,7 +744,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 5 unmodified lines
742744 goto fail;
743745 }
744746
745− if (!strcmp(filter->filter->name, "frei0r"))
747+ if (!strcmp(filter->filter->name, "frei0r") ||
748+ !strcmp(filter->filter->name, "ocv"))
746749 nb_leading = 1;
747750 else if (!strcmp(filter->filter->name, "frei0r_src"))
748751 nb_leading = 3;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t