History

Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'

* commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec': vf_fieldorder: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_fieldorder.c

Michael Niedermayer committed 13 years ago

Commit b8a1f8b2 parents 0c3d706 a39c1543 files · +22 −44Browse files

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

Unified · Split

libavfilter/avfilter.c+1−0
@@ -665,6 +665,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 664 unmodified lines
665665 !strcmp(filter->filter->name, "drawbox" ) ||
666666 !strcmp(filter->filter->name, "drawtext" ) ||
667667 !strcmp(filter->filter->name, "fade" ) ||
668+ !strcmp(filter->filter->name, "fieldorder") ||
668669 !strcmp(filter->filter->name, "format") ||
669670 !strcmp(filter->filter->name, "noformat") ||
670671 !strcmp(filter->filter->name, "resample")

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