* qatar/master:
  Use av_frame_copy() to simplify code where appropriate.

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