[FFmpeg-cvslog] Merge commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 12:15:21 2014 +0100| [3bfb7a2537cf4d876d9c29df08da522573fc0ebc] | committer: Michael Niedermayer

Merge commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97' into release/2.2

* commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bfb7a2537cf4d876d9c29df08da522573fc0ebc
---