[FFmpeg-cvslog] Merge commit 'b83e9efc53e5491716625aa31c69006b1119b280'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 00:50:53 2013 +0200| [c2696dabbbc6674e31b16d4e06b81e647e907d11] | committer: Michael Niedermayer

Merge commit 'b83e9efc53e5491716625aa31c69006b1119b280'

* commit 'b83e9efc53e5491716625aa31c69006b1119b280':
  vf_unsharp: switch to an AVOptions-based system.

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

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

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