diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:50:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:02:07 +0200 |
| commit | c2696dabbbc6674e31b16d4e06b81e647e907d11 (patch) | |
| tree | 2f2cf884ac2bb2d6b27b76e191cb41ec1dcea89d /libavfilter/avfilter.c | |
| parent | b4ffc35e76fc7106902323831248393f33f94c55 (diff) | |
| parent | b83e9efc53e5491716625aa31c69006b1119b280 (diff) | |
| download | ffmpeg-c2696dabbbc6674e31b16d4e06b81e647e907d11.tar.gz | |
Merge commit 'b83e9efc53e5491716625aa31c69006b1119b280'
* commit 'b83e9efc53e5491716625aa31c69006b1119b280':
vf_unsharp: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_unsharp.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 935c6fa287..036949d467 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -704,6 +704,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "subtitles") || !strcmp(filter->filter->name, "thumbnail") || !strcmp(filter->filter->name, "transpose") || + !strcmp(filter->filter->name, "unsharp" ) || // !strcmp(filter->filter->name, "scale" ) || !strcmp(filter->filter->name, "select") || 0 |