* commit '862f33c1':
  vf_scale: use the pixfmt descriptor API

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