Merge commit '4c41a7a1'

* commit '4c41a7a1':
  vf_frei0r: fix missing end of line character

Conflicts:
	libavfilter/vf_frei0r.c

No change as the token parsing change was not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>