[FFmpeg-cvslog] Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  5 12:05:41 2013 +0200| [2280b539c5050364d68e2cdbef2a0d3a7047544f] | committer: Michael Niedermayer

Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'

* commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff':
  lavfi doxy: improve/extend AVFilter doxy.

Conflicts:
	libavfilter/avfilter.h

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

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