[FFmpeg-cvslog] Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 10:34:05 2013 +0200| [c7b0a84e1fe1ba4415d5d578ddb9532d379201cf] | committer: Michael Niedermayer

Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'

* commit '62549f9655c48f0ec061087fa33a96040ce01145':
  lavfi: error out when options are provided to a filter that does not take any

Conflicts:
	libavfilter/avfilter.c

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

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