Merge commit 'ffba2053'

* commit 'ffba2053':
  lavfi: fix compatibility code for old vf_scale options syntax

Conflicts:
	libavfilter/avfilter.c

No change as the buggy code does not exist in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>