diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 16:28:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 16:34:44 +0200 |
| commit | eb6d58d23c557fe53b6b26f9e0b2350c1046b56d (patch) | |
| tree | 607c81046e7436948e744fa775f8ea3ed283e6ce /libavfilter/vf_frei0r.c | |
| parent | a3cb303a4c2235c4325130bae16c6e84bc4c9c15 (diff) | |
| parent | 51def31dbe5b6e857536de8fa428f263d64f3ae5 (diff) | |
| download | ffmpeg-eb6d58d23c557fe53b6b26f9e0b2350c1046b56d.tar.gz | |
Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'
* commit '51def31dbe5b6e857536de8fa428f263d64f3ae5':
vf_boxblur: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_boxblur.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_frei0r.c')
0 files changed, 0 insertions, 0 deletions