History

Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'

* commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303': vsrc_movie: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/src_movie.c

Michael Niedermayer committed 13 years ago

Commit 3a3d9842 parents 670e0f7 a42d6e63 files · +23 −35Browse files

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

Unified · Split

libavfilter/avfilter.c+2−0
@@ -712,6 +712,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 711 unmodified lines
712 !strcmp(filter->filter->name, "lowpass" ) ||712 !strcmp(filter->filter->name, "lowpass" ) ||
713 !strcmp(filter->filter->name, "mandelbrot" ) ||713 !strcmp(filter->filter->name, "mandelbrot" ) ||
714 !strcmp(filter->filter->name, "mptestsrc" ) ||714 !strcmp(filter->filter->name, "mptestsrc" ) ||
715 !strcmp(filter->filter->name, "movie" ) ||
716 !strcmp(filter->filter->name, "amovie" ) ||
715 !strcmp(filter->filter->name, "negate" ) ||717 !strcmp(filter->filter->name, "negate" ) ||
716 !strcmp(filter->filter->name, "noise" ) ||718 !strcmp(filter->filter->name, "noise" ) ||
717 !strcmp(filter->filter->name, "nullsrc" ) ||719 !strcmp(filter->filter->name, "nullsrc" ) ||

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