* qatar/master:
  vf_delogo: fix copying the input frame.

Conflicts:
	libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>