diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:13:29 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:36:29 +0400 |
| commit | 1c3cdf533ba0f47e70b166b335fe3282264950d7 (patch) | |
| tree | 7ad99a625ca16927836d686159ac6ec7aedbf12e /libavfilter/vf_delogo.c | |
| parent | 200e04c70f9a77fd117d4ebb9d0fad9656514979 (diff) | |
| parent | 460e7b4f6d473d9f03ed45501221f9cb209b28fd (diff) | |
Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'
* commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd':
vf_cropdetect: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_cropdetect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_delogo.c')
0 files changed, 0 insertions, 0 deletions