diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:48:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:49:58 +0200 |
| commit | f42635a50b7af62b120c09e98dbd4a12f4d1e4b5 (patch) | |
| tree | 562ffbe8d57fdb4fdd7b5d9681eea61b55d81e47 /libavfilter/avfilter.c | |
| parent | 270d3c96ec492e004275fdb7fd625f801fd1a26b (diff) | |
| parent | 33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff (diff) | |
Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'
* commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff':
vf_setpts: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1e16809ed8..b301b33de2 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -690,6 +690,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "pp" ) || !strcmp(filter->filter->name, "aperms") || !strcmp(filter->filter->name, "resample") || + !strcmp(filter->filter->name, "setpts" ) || !strcmp(filter->filter->name, "showspectrum") || !strcmp(filter->filter->name, "silencedetect") || !strcmp(filter->filter->name, "subtitles") || |