-
Michael Niedermayer authored
* commit '63e58c55': vf_delogo: switch to an AVOptions-based system. Conflicts: libavfilter/vf_delogo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
eebe0b02
* commit '63e58c55': vf_delogo: switch to an AVOptions-based system. Conflicts: libavfilter/vf_delogo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>