[FFmpeg-cvslog] Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 19:51:02 2013 +0200| [da3f89988f03ffb399879c5ffabed8b4111e548a] | committer: Michael Niedermayer

Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'

* commit '5aa1a668cfae7f617e1a06efad20f87283badd8a':
  vf_frei0r: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_frei0r.c

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

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