-
Michael Niedermayer authored
* qatar/master: vf_delogo: fix copying the input frame. Conflicts: libavfilter/vf_delogo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
5068bcda
* qatar/master:
vf_delogo: fix copying the input frame.
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>