diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 18:11:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 18:11:15 +0200 |
| commit | 0726d516dcd1e12d493b402bbe256d8c4b50acc6 (patch) | |
| tree | 7d4e275fa24f50688aadf3a91771cc2c0f5b837e /libavfilter/avfilter.c | |
| parent | 215ca864759a54f45265a51ac57dbfd75cb23da2 (diff) | |
| parent | 335c31293baec6e6cf5907bd29840af3de8ff735 (diff) | |
| download | ffmpeg-0726d516dcd1e12d493b402bbe256d8c4b50acc6.tar.gz | |
Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'
* commit '335c31293baec6e6cf5907bd29840af3de8ff735':
vf_drawbox: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_drawbox.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 1433422f3d..efe378c989 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -662,6 +662,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "cropdetect") || !strcmp(filter->filter->name, "delogo" ) || + !strcmp(filter->filter->name, "drawbox" ) || !strcmp(filter->filter->name, "format") || !strcmp(filter->filter->name, "noformat") || !strcmp(filter->filter->name, "resample") |