[FFmpeg-cvslog] Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 27 02:46:56 2014 +0200| [6e9dbee7c65714e940b5cc56f84b896f2c9ab239] | committer: Michael Niedermayer

Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'

* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
  vf_format: rework format list parsing

Conflicts:
	libavfilter/vf_format.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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